From b1961c292e22d2a4c6082773c1bd2dd9eb9b7053 Mon Sep 17 00:00:00 2001 From: Kevin DeJong Date: Wed, 26 Jun 2024 03:26:39 -0700 Subject: [PATCH] JSON object type cleanup --- ...4cfc32461d10e077e7e5de1fc25d8b8f.meta.json | 2 +- ...6bb7f975b606f8db57532faddfcdd8c8.meta.json | 2 +- .../all/aws_apigateway_model/__init__.py | 0 .../all/aws_apigateway_model/schema.json | 19 ++ .../all/aws_apigateway_restapi/__init__.py | 0 .../all/aws_apigateway_restapi/body.json | 19 ++ .../all/aws_apigateway_restapi/policy.json | 19 ++ .../all/aws_apigatewayv2_vpclink/__init__.py | 0 .../all/aws_apigatewayv2_vpclink/tags.json | 19 ++ .../__init__.py | 0 .../data.json | 17 ++ .../all/aws_codepipeline_pipeline/__init__.py | 0 .../actiondeclaration_configuration.json | 19 ++ .../all/aws_cognito_identitypool/__init__.py | 0 .../cognitoevents.json | 19 ++ .../supportedloginproviders.json | 19 ++ .../__init__.py | 0 .../rolemappings.json | 19 ++ .../roles.json | 19 ++ .../all/aws_cognito_userpool/__init__.py | 0 .../aws_cognito_userpool/userpooltags.json | 19 ++ .../all/aws_cognito_userpooluser/__init__.py | 0 .../clientmetadata.json | 19 ++ .../__init__.py | 0 .../enabledcontrolparameter_value.json | 25 +++ .../crossregioncopytargets.json | 5 +- .../aws_dlm_lifecyclepolicy/excludetags.json | 5 +- .../excludevolumetypeslist.json | 5 +- .../__init__.py | 0 .../parameters.json | 19 ++ .../providers/all/aws_iot_policy/__init__.py | 0 .../all/aws_iot_policy/policydocument.json | 19 ++ .../servicemanageds3.json | 5 +- .../jsonconfiguration.json | 5 +- .../servicemanageds3.json | 5 +- .../tablewildcard.json | 5 +- .../tablewildcard.json | 5 +- .../tablewildcard.json | 5 +- .../aribdestinationsettings.json | 5 +- .../aribsourcesettings.json | 5 +- .../colorspacepassthroughsettings.json | 5 +- .../dolbyvision81settings.json | 5 +- .../embeddeddestinationsettings.json | 5 +- ...embeddedplusscte20destinationsettings.json | 5 +- .../framecapturehlssettings.json | 5 +- .../htmlmotiongraphicssettings.json | 5 +- .../mediapackageoutputsettings.json | 5 +- .../multiplexgroupsettings.json | 5 +- .../passthroughsettings.json | 5 +- .../pipelinelockingsettings.json | 5 +- .../aws_medialive_channel/rawsettings.json | 5 +- .../aws_medialive_channel/rec601settings.json | 5 +- .../aws_medialive_channel/rec709settings.json | 5 +- .../rtmpcaptioninfodestinationsettings.json | 5 +- ...scte20plusembeddeddestinationsettings.json | 5 +- .../scte27destinationsettings.json | 5 +- .../smptettdestinationsettings.json | 5 +- .../teletextdestinationsettings.json | 5 +- .../__init__.py | 0 .../parameters.json | 19 ++ .../aws_neptune_dbparametergroup/__init__.py | 0 .../parameters.json | 19 ++ .../all/aws_opsworks_layer/__init__.py | 0 .../all/aws_opsworks_layer/customjson.json | 19 ++ .../all/aws_opsworks_stack/__init__.py | 0 .../all/aws_opsworks_stack/customjson.json | 19 ++ .../all/aws_pinpoint_app/__init__.py | 0 .../providers/all/aws_pinpoint_app/tags.json | 18 ++ .../all/aws_pinpoint_segment/__init__.py | 0 .../segmentdimensions_attributes.json | 19 ++ .../segmentdimensions_metrics.json | 19 ++ .../segmentdimensions_userattributes.json | 19 ++ .../all/aws_pinpoint_segment/tags.json | 18 ++ .../noauthconfiguration.json | 5 +- .../allsheetsfilterscopeconfiguration.json | 5 +- .../axisdisplaydatadrivenrange.json | 5 +- .../allsheetsfilterscopeconfiguration.json | 5 +- .../axisdisplaydatadrivenrange.json | 5 +- .../allsheetsfilterscopeconfiguration.json | 5 +- .../axisdisplaydatadrivenrange.json | 5 +- .../all/aws_robomaker_fleet/__init__.py | 0 .../all/aws_robomaker_fleet/tags.json | 18 ++ .../all/aws_robomaker_robot/__init__.py | 0 .../all/aws_robomaker_robot/tags.json | 18 ++ .../__init__.py | 0 .../aws_robomaker_robotapplication/tags.json | 18 ++ .../__init__.py | 0 .../tags.json | 18 ++ .../af_south_1/aws-apigatewayv2-vpclink.json | 5 +- .../aws-cloudformation-waitcondition.json | 4 +- .../af_south_1/aws-codepipeline-pipeline.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../providers/af_south_1/aws-iot-policy.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../af_south_1/aws-opsworks-layer.json | 5 +- .../af_south_1/aws-opsworks-stack.json | 5 +- .../ap_east_1/aws-apigatewayv2-vpclink.json | 5 +- .../ap_east_1/aws-cognito-identitypool.json | 10 +- ...ws-cognito-identitypoolroleattachment.json | 10 +- .../ap_east_1/aws-cognito-userpool.json | 5 +- .../ap_east_1/aws-cognito-userpooluser.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../ap_northeast_1/aws-pinpoint-app.json | 4 +- .../ap_northeast_1/aws-pinpoint-segment.json | 19 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../ap_northeast_2/aws-pinpoint-app.json | 4 +- .../ap_northeast_2/aws-pinpoint-segment.json | 19 +- .../ap_northeast_2/aws-robomaker-fleet.json | 4 +- .../ap_northeast_2/aws-robomaker-robot.json | 4 +- .../aws-robomaker-robotapplication.json | 4 +- .../aws-robomaker-simulationapplication.json | 4 +- .../ap_northeast_3/aws-apigateway-model.json | 5 +- .../aws-apigateway-restapi.json | 10 +- .../aws-apigatewayv2-vpclink.json | 5 +- .../ap_northeast_3/aws-iot-policy.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../ap_south_1/aws-robomaker-fleet.json | 4 +- .../ap_south_1/aws-robomaker-robot.json | 4 +- .../aws-robomaker-robotapplication.json | 4 +- .../aws-robomaker-simulationapplication.json | 4 +- .../ap_south_2/aws-apigateway-model.json | 5 +- .../ap_south_2/aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../providers/ap_south_2/aws-iot-policy.json | 5 +- .../ap_south_2/aws-opsworks-layer.json | 5 +- .../ap_south_2/aws-opsworks-stack.json | 5 +- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../ap_southeast_1/aws-pinpoint-app.json | 4 +- .../ap_southeast_1/aws-pinpoint-segment.json | 19 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../ap_southeast_2/aws-robomaker-fleet.json | 4 +- .../ap_southeast_2/aws-robomaker-robot.json | 4 +- .../aws-robomaker-robotapplication.json | 4 +- .../aws-robomaker-simulationapplication.json | 4 +- .../ap_southeast_3/aws-apigateway-model.json | 5 +- .../aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../ap_southeast_3/aws-iot-policy.json | 5 +- .../ap_southeast_3/aws-opsworks-layer.json | 5 +- .../ap_southeast_3/aws-opsworks-stack.json | 5 +- .../ap_southeast_4/aws-apigateway-model.json | 5 +- .../aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../ap_southeast_4/aws-iot-policy.json | 5 +- .../ap_southeast_4/aws-opsworks-layer.json | 5 +- .../ap_southeast_4/aws-opsworks-stack.json | 5 +- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../ca_central_1/aws-pinpoint-app.json | 4 +- .../ca_central_1/aws-pinpoint-segment.json | 19 +- .../schemas/providers/ca_west_1/__init__.py | 3 + .../ca_west_1/aws-apigateway-model.json | 5 +- .../ca_west_1/aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-controltower-enabledcontrol.json | 198 ------------------ .../providers/ca_west_1/aws-iot-policy.json | 5 +- .../ca_west_1/aws-opsworks-layer.json | 5 +- .../ca_west_1/aws-opsworks-stack.json | 5 +- .../ca_west_1/aws-rds-dbcluster.json | 3 + .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../eu_central_2/aws-apigateway-model.json | 5 +- .../eu_central_2/aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-codepipeline-pipeline.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../eu_central_2/aws-iot-policy.json | 5 +- .../eu_central_2/aws-opsworks-layer.json | 5 +- .../eu_central_2/aws-opsworks-stack.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../eu_south_1/aws-apigatewayv2-vpclink.json | 5 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../providers/eu_south_1/aws-iot-policy.json | 5 +- .../eu_south_1/aws-opsworks-layer.json | 5 +- .../eu_south_1/aws-opsworks-stack.json | 5 +- .../eu_south_2/aws-apigateway-model.json | 5 +- .../eu_south_2/aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../providers/eu_south_2/aws-iot-policy.json | 5 +- .../eu_south_2/aws-opsworks-layer.json | 5 +- .../eu_south_2/aws-opsworks-stack.json | 5 +- .../providers/eu_west_2/aws-pinpoint-app.json | 4 +- .../eu_west_2/aws-pinpoint-segment.json | 19 +- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../il_central_1/aws-apigateway-model.json | 5 +- .../il_central_1/aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../il_central_1/aws-iot-policy.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../il_central_1/aws-opsworks-layer.json | 5 +- .../il_central_1/aws-opsworks-stack.json | 5 +- .../me_central_1/aws-apigateway-model.json | 5 +- .../me_central_1/aws-apigateway-restapi.json | 10 +- .../aws-cloudformation-waitcondition.json | 4 +- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../me_central_1/aws-opsworks-layer.json | 5 +- .../me_central_1/aws-opsworks-stack.json | 5 +- .../me_south_1/aws-apigatewayv2-vpclink.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../aws-cloudformation-waitcondition.json | 4 +- .../us_east_1/aws-codepipeline-pipeline.json | 5 +- .../us_east_1/aws-cognito-identitypool.json | 10 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../us_east_1/aws-dlm-lifecyclepolicy.json | 15 +- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../us_east_1/aws-iotanalytics-channel.json | 5 +- .../us_east_1/aws-iotanalytics-datastore.json | 10 +- .../aws-lakeformation-permissions.json | 5 +- ...ws-lakeformation-principalpermissions.json | 5 +- .../aws-lakeformation-tagassociation.json | 5 +- .../us_east_1/aws-medialive-channel.json | 100 +++++++-- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../us_east_1/aws-opsworks-layer.json | 5 +- .../us_east_1/aws-opsworks-stack.json | 5 +- .../providers/us_east_1/aws-pinpoint-app.json | 4 +- .../us_east_1/aws-pinpoint-segment.json | 19 +- .../us_east_1/aws-qbusiness-plugin.json | 5 +- .../us_east_1/aws-quicksight-analysis.json | 10 +- .../us_east_1/aws-quicksight-dashboard.json | 10 +- .../us_east_1/aws-quicksight-template.json | 10 +- .../us_gov_east_1/aws-apigateway-model.json | 5 +- .../us_gov_east_1/aws-apigateway-restapi.json | 10 +- .../aws-apigatewayv2-vpclink.json | 5 +- .../aws-codepipeline-pipeline.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../aws-apigatewayv2-vpclink.json | 5 +- .../aws-controltower-enabledcontrol.json | 50 ++--- .../aws-docdb-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../us_gov_west_1/aws-pinpoint-app.json | 4 +- .../us_gov_west_1/aws-pinpoint-segment.json | 19 +- .../aws-neptune-dbclusterparametergroup.json | 5 +- .../aws-neptune-dbparametergroup.json | 5 +- .../providers/base.definition.schema.v1.json | 8 + 273 files changed, 1781 insertions(+), 938 deletions(-) create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/schema.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/body.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/policy.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/tags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/data.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/actiondeclaration_configuration.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/cognitoevents.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/supportedloginproviders.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/rolemappings.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/roles.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/userpooltags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/clientmetadata.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/enabledcontrolparameter_value.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/parameters.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/policydocument.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/parameters.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/parameters.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/customjson.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/customjson.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/tags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_attributes.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_metrics.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_userattributes.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/tags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/tags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/tags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/tags.json create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/__init__.py create mode 100644 src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/tags.json delete mode 100644 src/cfnlint/data/schemas/providers/ca_west_1/aws-controltower-enabledcontrol.json diff --git a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json index 5251bef81e..1666735d6e 100644 --- a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json @@ -1 +1 @@ -{"etag": "\"77f8f0ff694760d9d86001ab4dca1909\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"cab7c18393919e17ef44d9fca8c62008\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json index 2e679ad89d..81c4509e4d 100644 --- a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json @@ -1 +1 @@ -{"etag": "\"bb135f465b3346b7dea602d254e4c44c\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"ca78dae4bedfa5f1574d2d0cafd31df2\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/schema.json b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/schema.json new file mode 100644 index 0000000000..0bbbe3b4a0 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_model/schema.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Schema", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Schema", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/body.json b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/body.json new file mode 100644 index 0000000000..49d995db12 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/body.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Body", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Body", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/policy.json b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/policy.json new file mode 100644 index 0000000000..f2cd485f7a --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_apigateway_restapi/policy.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Policy", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Policy", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/tags.json new file mode 100644 index 0000000000..79cd834d08 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_apigatewayv2_vpclink/tags.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object", + "string" + ] + } + } +] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/data.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/data.json new file mode 100644 index 0000000000..ad3de7cd12 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cloudformation_waitcondition/data.json @@ -0,0 +1,17 @@ +[ + { + "op": "test", + "path": "/properties/Data", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Data", + "value": { + "type": + ["object"] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/actiondeclaration_configuration.json b/src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/actiondeclaration_configuration.json new file mode 100644 index 0000000000..0d08353b70 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_codepipeline_pipeline/actiondeclaration_configuration.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/definitions/ActionDeclaration/properties/Configuration", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/definitions/ActionDeclaration/properties/Configuration", + "value": { + "type": [ + "object", + "string" + ] + } + } +] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/cognitoevents.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/cognitoevents.json new file mode 100644 index 0000000000..a5461445cc --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/cognitoevents.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/CognitoEvents", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/CognitoEvents", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/supportedloginproviders.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/supportedloginproviders.json new file mode 100644 index 0000000000..238bfacf6f --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypool/supportedloginproviders.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/SupportedLoginProviders", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/SupportedLoginProviders", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/rolemappings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/rolemappings.json new file mode 100644 index 0000000000..4a156d3f7e --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/rolemappings.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/RoleMappings", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/RoleMappings", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/roles.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/roles.json new file mode 100644 index 0000000000..46eb95f2e6 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_identitypoolroleattachment/roles.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Roles", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Roles", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/userpooltags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/userpooltags.json new file mode 100644 index 0000000000..5f655cb107 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpool/userpooltags.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/UserPoolTags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/UserPoolTags", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/clientmetadata.json b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/clientmetadata.json new file mode 100644 index 0000000000..5a8b08ddad --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_cognito_userpooluser/clientmetadata.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/ClientMetadata", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/ClientMetadata", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/enabledcontrolparameter_value.json b/src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/enabledcontrolparameter_value.json new file mode 100644 index 0000000000..2b481d714d --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_controltower_enabledcontrol/enabledcontrolparameter_value.json @@ -0,0 +1,25 @@ +[ + { + "op": "replace", + "path": "/definitions/EnabledControlParameter/properties/Value", + "value": { + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" + ] + } + } +] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/crossregioncopytargets.json b/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/crossregioncopytargets.json index 987b567fbc..f65d6b73a0 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/crossregioncopytargets.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/crossregioncopytargets.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/CrossRegionCopyTargets", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludetags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludetags.json index aead3f1b35..9ed778b141 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludetags.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludetags.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/ExcludeTags", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludevolumetypeslist.json b/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludevolumetypeslist.json index 38d5018384..6e686fd120 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludevolumetypeslist.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_dlm_lifecyclepolicy/excludevolumetypeslist.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/ExcludeVolumeTypesList", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/parameters.json b/src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/parameters.json new file mode 100644 index 0000000000..f97b35b36c --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_docdb_dbclusterparametergroup/parameters.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Parameters", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Parameters", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/policydocument.json b/src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/policydocument.json new file mode 100644 index 0000000000..a7cdf439ed --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_iot_policy/policydocument.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/PolicyDocument", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/PolicyDocument", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_channel/servicemanageds3.json b/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_channel/servicemanageds3.json index 711a859ebc..475cbdc7a8 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_channel/servicemanageds3.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_channel/servicemanageds3.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/ServiceManagedS3", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/jsonconfiguration.json b/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/jsonconfiguration.json index 3b7699d5d8..97142b2b3c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/jsonconfiguration.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/jsonconfiguration.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/JsonConfiguration", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/servicemanageds3.json b/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/servicemanageds3.json index 711a859ebc..475cbdc7a8 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/servicemanageds3.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_iotanalytics_datastore/servicemanageds3.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/ServiceManagedS3", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_permissions/tablewildcard.json b/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_permissions/tablewildcard.json index b9222c514b..0dd3a737c1 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_permissions/tablewildcard.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_permissions/tablewildcard.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/TableWildcard", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_principalpermissions/tablewildcard.json b/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_principalpermissions/tablewildcard.json index b9222c514b..0dd3a737c1 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_principalpermissions/tablewildcard.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_principalpermissions/tablewildcard.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/TableWildcard", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_tagassociation/tablewildcard.json b/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_tagassociation/tablewildcard.json index b9222c514b..0dd3a737c1 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_tagassociation/tablewildcard.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_lakeformation_tagassociation/tablewildcard.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/TableWildcard", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribdestinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribdestinationsettings.json index 09e6d6eabf..6ad78796f1 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribdestinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribdestinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AribDestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribsourcesettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribsourcesettings.json index e596b9383c..f28a05dba4 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribsourcesettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/aribsourcesettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AribSourceSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/colorspacepassthroughsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/colorspacepassthroughsettings.json index 9a6c42fb65..2e2fde5d35 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/colorspacepassthroughsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/colorspacepassthroughsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/ColorSpacePassthroughSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/dolbyvision81settings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/dolbyvision81settings.json index e23eb1e8f8..ac973fc357 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/dolbyvision81settings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/dolbyvision81settings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/DolbyVision81Settings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddeddestinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddeddestinationsettings.json index db8ffa0076..159504f848 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddeddestinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddeddestinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/EmbeddedDestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddedplusscte20destinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddedplusscte20destinationsettings.json index 02c8b94df7..2b11ff0fa4 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddedplusscte20destinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/embeddedplusscte20destinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/EmbeddedPlusScte20DestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/framecapturehlssettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/framecapturehlssettings.json index 4ef914fe3d..f952e952a5 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/framecapturehlssettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/framecapturehlssettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/FrameCaptureHlsSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/htmlmotiongraphicssettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/htmlmotiongraphicssettings.json index 97a7e69a6b..e33adf1881 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/htmlmotiongraphicssettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/htmlmotiongraphicssettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/HtmlMotionGraphicsSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/mediapackageoutputsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/mediapackageoutputsettings.json index 91e00dbbae..94d03d9568 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/mediapackageoutputsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/mediapackageoutputsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/MediaPackageOutputSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/multiplexgroupsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/multiplexgroupsettings.json index 392359163b..9cc959cc1a 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/multiplexgroupsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/multiplexgroupsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/MultiplexGroupSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/passthroughsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/passthroughsettings.json index c0eed2eb83..0a53a0418c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/passthroughsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/passthroughsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/PassThroughSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/pipelinelockingsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/pipelinelockingsettings.json index c8a9c66e65..963f39df07 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/pipelinelockingsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/pipelinelockingsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/PipelineLockingSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rawsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rawsettings.json index dc7fbdf7ec..abe943cd35 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rawsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rawsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/RawSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec601settings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec601settings.json index 8f71122068..7f8c79ecfa 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec601settings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec601settings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/Rec601Settings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec709settings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec709settings.json index b9ab75231a..777510999d 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec709settings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rec709settings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/Rec709Settings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rtmpcaptioninfodestinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rtmpcaptioninfodestinationsettings.json index 8d2e134b6a..8fc979665b 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rtmpcaptioninfodestinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/rtmpcaptioninfodestinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/RtmpCaptionInfoDestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte20plusembeddeddestinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte20plusembeddeddestinationsettings.json index d552746700..56aadd675d 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte20plusembeddeddestinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte20plusembeddeddestinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/Scte20PlusEmbeddedDestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte27destinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte27destinationsettings.json index f430380f04..d59f580943 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte27destinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/scte27destinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/Scte27DestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/smptettdestinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/smptettdestinationsettings.json index c139b30591..5200368a2c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/smptettdestinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/smptettdestinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/SmpteTtDestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/teletextdestinationsettings.json b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/teletextdestinationsettings.json index 7cc9f9e003..250a00424d 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/teletextdestinationsettings.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_medialive_channel/teletextdestinationsettings.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/TeletextDestinationSettings", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/parameters.json b/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/parameters.json new file mode 100644 index 0000000000..f97b35b36c --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbclusterparametergroup/parameters.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Parameters", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Parameters", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/parameters.json b/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/parameters.json new file mode 100644 index 0000000000..f97b35b36c --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_neptune_dbparametergroup/parameters.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/Parameters", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Parameters", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/customjson.json b/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/customjson.json new file mode 100644 index 0000000000..75b0ded446 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_layer/customjson.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/CustomJson", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/CustomJson", + "value": { + "type": [ + "object", + "string" + ] + } + } +] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/customjson.json b/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/customjson.json new file mode 100644 index 0000000000..75b0ded446 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_opsworks_stack/customjson.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/properties/CustomJson", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/CustomJson", + "value": { + "type": [ + "object", + "string" + ] + } + } +] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/tags.json new file mode 100644 index 0000000000..227239c2d5 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_app/tags.json @@ -0,0 +1,18 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_attributes.json b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_attributes.json new file mode 100644 index 0000000000..83924f38ea --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_attributes.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/definitions/SegmentDimensions/properties/Attributes", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/definitions/SegmentDimensions/properties/Attributes", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_metrics.json b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_metrics.json new file mode 100644 index 0000000000..2b14453147 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_metrics.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/definitions/SegmentDimensions/properties/Metrics", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/definitions/SegmentDimensions/properties/Metrics", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_userattributes.json b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_userattributes.json new file mode 100644 index 0000000000..4598921388 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/segmentdimensions_userattributes.json @@ -0,0 +1,19 @@ +[ + { + "op": "test", + "path": "/definitions/SegmentDimensions/properties/UserAttributes", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/definitions/SegmentDimensions/properties/UserAttributes", + "value": { + "type": [ + "object", + "string" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/tags.json new file mode 100644 index 0000000000..227239c2d5 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_pinpoint_segment/tags.json @@ -0,0 +1,18 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_qbusiness_plugin/noauthconfiguration.json b/src/cfnlint/data/schemas/patches/providers/all/aws_qbusiness_plugin/noauthconfiguration.json index cca4f05857..deebe0930b 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_qbusiness_plugin/noauthconfiguration.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_qbusiness_plugin/noauthconfiguration.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/NoAuthConfiguration", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/allsheetsfilterscopeconfiguration.json b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/allsheetsfilterscopeconfiguration.json index d76d2a4d8a..acc94eae1c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/allsheetsfilterscopeconfiguration.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/allsheetsfilterscopeconfiguration.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AllSheetsFilterScopeConfiguration", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/axisdisplaydatadrivenrange.json b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/axisdisplaydatadrivenrange.json index 7efbfe0942..10ff80f06c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/axisdisplaydatadrivenrange.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_analysis/axisdisplaydatadrivenrange.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AxisDisplayDataDrivenRange", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/allsheetsfilterscopeconfiguration.json b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/allsheetsfilterscopeconfiguration.json index d76d2a4d8a..acc94eae1c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/allsheetsfilterscopeconfiguration.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/allsheetsfilterscopeconfiguration.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AllSheetsFilterScopeConfiguration", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/axisdisplaydatadrivenrange.json b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/axisdisplaydatadrivenrange.json index 7efbfe0942..10ff80f06c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/axisdisplaydatadrivenrange.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_dashboard/axisdisplaydatadrivenrange.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AxisDisplayDataDrivenRange", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/allsheetsfilterscopeconfiguration.json b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/allsheetsfilterscopeconfiguration.json index d76d2a4d8a..acc94eae1c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/allsheetsfilterscopeconfiguration.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/allsheetsfilterscopeconfiguration.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AllSheetsFilterScopeConfiguration", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/axisdisplaydatadrivenrange.json b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/axisdisplaydatadrivenrange.json index 7efbfe0942..10ff80f06c 100644 --- a/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/axisdisplaydatadrivenrange.json +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_quicksight_template/axisdisplaydatadrivenrange.json @@ -11,7 +11,10 @@ "op": "replace", "path": "/definitions/AxisDisplayDataDrivenRange", "value": { - "type": "object" + "type": [ + "object", + "string" + ] } } ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/tags.json new file mode 100644 index 0000000000..227239c2d5 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_fleet/tags.json @@ -0,0 +1,18 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/tags.json new file mode 100644 index 0000000000..227239c2d5 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robot/tags.json @@ -0,0 +1,18 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/tags.json new file mode 100644 index 0000000000..227239c2d5 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_robotapplication/tags.json @@ -0,0 +1,18 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/__init__.py b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/tags.json b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/tags.json new file mode 100644 index 0000000000..227239c2d5 --- /dev/null +++ b/src/cfnlint/data/schemas/patches/providers/all/aws_robomaker_simulationapplication/tags.json @@ -0,0 +1,18 @@ +[ + { + "op": "test", + "path": "/properties/Tags", + "value": { + "type": "object" + } + }, + { + "op": "replace", + "path": "/properties/Tags", + "value": { + "type": [ + "object" + ] + } + } + ] diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-codepipeline-pipeline.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-codepipeline-pipeline.json index 97d26f6088..4575c69e2a 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-codepipeline-pipeline.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-codepipeline-pipeline.json @@ -11,7 +11,10 @@ "$ref": "#/definitions/ActionTypeId" }, "Configuration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "InputArtifacts": { "items": { diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypool.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypool.json index 2cb7542fb6..46ac1fba2e 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypool.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypool.json @@ -59,7 +59,10 @@ "type": "boolean" }, "CognitoEvents": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CognitoIdentityProviders": { "items": { @@ -101,7 +104,10 @@ "uniqueItems": false }, "SupportedLoginProviders": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypoolroleattachment.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypoolroleattachment.json index d4ea2e7ad7..a988ab33e8 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypoolroleattachment.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-identitypoolroleattachment.json @@ -14,10 +14,16 @@ "type": "string" }, "RoleMappings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Roles": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpool.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpool.json index 86d975c369..ee04e1224c 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpool.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpool.json @@ -361,7 +361,10 @@ "type": "string" }, "UserPoolTags": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UsernameAttributes": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpooluser.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpooluser.json index d996b0aae2..d6d1bec9ff 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpooluser.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-cognito-userpooluser.json @@ -29,7 +29,10 @@ ], "properties": { "ClientMetadata": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DesiredDeliveryMediums": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-app.json index af8ce90d32..444ed27dd6 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-segment.json index 6ea1a3f3a5..3763227d9e 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-app.json index af8ce90d32..444ed27dd6 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-segment.json index 6ea1a3f3a5..3763227d9e 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-fleet.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-fleet.json index 149b0ad719..42078134c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-fleet.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-fleet.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robot.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robot.json index 44c4ce00a2..4422ddb81d 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robot.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robot.json @@ -26,7 +26,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robotapplication.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robotapplication.json index 1ec7438e7e..4d4d4fe72c 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robotapplication.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-robotapplication.json @@ -69,7 +69,9 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-simulationapplication.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-simulationapplication.json index c54458425c..aaf8f117ee 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-simulationapplication.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-robomaker-simulationapplication.json @@ -109,7 +109,9 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-model.json index c17fb93fff..8122317a63 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-policy.json index feaf6d58e1..d874b4bb99 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-fleet.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-fleet.json index 149b0ad719..42078134c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-fleet.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-fleet.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robot.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robot.json index 44c4ce00a2..4422ddb81d 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robot.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robot.json @@ -26,7 +26,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robotapplication.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robotapplication.json index 1ec7438e7e..4d4d4fe72c 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robotapplication.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-robotapplication.json @@ -69,7 +69,9 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-simulationapplication.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-simulationapplication.json index c54458425c..aaf8f117ee 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-simulationapplication.json +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-robomaker-simulationapplication.json @@ -109,7 +109,9 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-app.json index af8ce90d32..444ed27dd6 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-segment.json index 6ea1a3f3a5..3763227d9e 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-fleet.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-fleet.json index 149b0ad719..42078134c3 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-fleet.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-fleet.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robot.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robot.json index 44c4ce00a2..4422ddb81d 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robot.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robot.json @@ -26,7 +26,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robotapplication.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robotapplication.json index 1ec7438e7e..4d4d4fe72c 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robotapplication.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-robotapplication.json @@ -69,7 +69,9 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-simulationapplication.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-simulationapplication.json index c54458425c..aaf8f117ee 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-simulationapplication.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-robomaker-simulationapplication.json @@ -109,7 +109,9 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-app.json index af8ce90d32..444ed27dd6 100644 --- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-segment.json index 6ea1a3f3a5..3763227d9e 100644 --- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py index 085b153b34..409048d0ac 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py @@ -468,6 +468,7 @@ "AWS::SSM::ResourceDataSync", "AWS::EC2::IPAM", "AWS::EC2::TransitGatewayPeeringAttachment", + "AWS::ECR::RepositoryCreationTemplate", "AWS::CloudFront::CachePolicy", "AWS::IAM::AccessKey", "AWS::RDS::DBSubnetGroup", @@ -554,6 +555,7 @@ "aws-route53-dnssec.json", "aws-redshift-endpointauthorization.json", "aws-ec2-transitgatewayroutetable.json", + "aws-controltower-enabledcontrol.json", "aws-route53-recordset.json", "aws-eks-accessentry.json", "aws-elasticache-securitygroup.json", @@ -891,6 +893,7 @@ "aws-ssm-resourcedatasync.json", "aws-ec2-ipam.json", "aws-ec2-transitgatewaypeeringattachment.json", + "aws-ecr-repositorycreationtemplate.json", "aws-cloudfront-cachepolicy.json", "aws-rds-dbsubnetgroup.json", "aws-amazonmq-configuration.json", diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-controltower-enabledcontrol.json deleted file mode 100644 index 75018496ac..0000000000 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-controltower-enabledcontrol.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/TargetIdentifier", - "/properties/ControlIdentifier" - ], - "definitions": { - "EnabledControlParameter": { - "additionalProperties": false, - "properties": { - "Key": { - "type": "string" - }, - "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - } - }, - "handlers": { - "create": { - "permissions": [ - "controltower:ListEnabledControls", - "controltower:GetEnabledControl", - "controltower:GetControlOperation", - "controltower:EnableControl", - "controltower:TagResource", - "organizations:UpdatePolicy", - "organizations:CreatePolicy", - "organizations:AttachPolicy", - "organizations:DetachPolicy", - "organizations:ListPoliciesForTarget", - "organizations:ListTargetsForPolicy", - "organizations:DescribePolicy" - ] - }, - "delete": { - "permissions": [ - "controltower:GetControlOperation", - "controltower:DisableControl", - "organizations:UpdatePolicy", - "organizations:DeletePolicy", - "organizations:CreatePolicy", - "organizations:AttachPolicy", - "organizations:DetachPolicy", - "organizations:ListPoliciesForTarget", - "organizations:ListTargetsForPolicy", - "organizations:DescribePolicy" - ] - }, - "list": { - "handlerSchema": { - "properties": { - "TargetIdentifier": { - "$ref": "resource-schema.json#/properties/TargetIdentifier" - } - }, - "required": [ - "TargetIdentifier" - ] - }, - "permissions": [ - "controltower:ListEnabledControls" - ] - }, - "read": { - "permissions": [ - "controltower:ListEnabledControls", - "controltower:GetEnabledControl", - "controltower:ListTagsForResource" - ] - }, - "update": { - "permissions": [ - "controltower:ListEnabledControls", - "controltower:GetEnabledControl", - "controltower:GetControlOperation", - "controltower:UpdateEnabledControl", - "controltower:UntagResource", - "controltower:TagResource", - "organizations:UpdatePolicy", - "organizations:CreatePolicy", - "organizations:AttachPolicy", - "organizations:DetachPolicy", - "organizations:ListPoliciesForTarget", - "organizations:ListTargetsForPolicy", - "organizations:DescribePolicy" - ] - } - }, - "primaryIdentifier": [ - "/properties/TargetIdentifier", - "/properties/ControlIdentifier" - ], - "properties": { - "ControlIdentifier": { - "maxLength": 2048, - "minLength": 20, - "pattern": "^arn:aws[0-9a-zA-Z_\\-:\\/]+$", - "type": "string" - }, - "Parameters": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/EnabledControlParameter" - }, - "minItems": 1, - "type": "array" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "minItems": 1, - "type": "array" - }, - "TargetIdentifier": { - "maxLength": 2048, - "minLength": 20, - "pattern": "^arn:aws[0-9a-zA-Z_\\-:\\/]+$", - "type": "string" - } - }, - "required": [ - "TargetIdentifier", - "ControlIdentifier" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-controltower", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ControlTower::EnabledControl" -} diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbcluster.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbcluster.json index 62a3797fcd..e0756eb08e 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbcluster.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-rds-dbcluster.json @@ -302,6 +302,9 @@ "EnableIAMDatabaseAuthentication": { "type": "boolean" }, + "EnableLocalWriteForwarding": { + "type": "boolean" + }, "Endpoint": { "$ref": "#/definitions/Endpoint" }, diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-codepipeline-pipeline.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-codepipeline-pipeline.json index 97d26f6088..4575c69e2a 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-codepipeline-pipeline.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-codepipeline-pipeline.json @@ -11,7 +11,10 @@ "$ref": "#/definitions/ActionTypeId" }, "Configuration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "InputArtifacts": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-app.json index af8ce90d32..444ed27dd6 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-segment.json index 6ea1a3f3a5..3763227d9e 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-policy.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-policy.json index 5fe07786fe..2fe7a81560 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-policy.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-policy.json @@ -15,7 +15,10 @@ "type": "string" }, "PolicyDocument": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PolicyName": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-model.json index d5bd5b2c83..5086400724 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-cloudformation-waitcondition.json index 56569e9e3d..a95be9629a 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-layer.json index 7688721865..2713480ea1 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-stack.json index aac55c0767..a70f0a1a62 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/sa_east_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/sa_east_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-waitcondition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-waitcondition.json index 61f292e721..0660996701 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-waitcondition.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-waitcondition.json @@ -8,7 +8,9 @@ "type": "integer" }, "Data": { - "type": "object" + "type": [ + "object" + ] }, "Handle": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-codepipeline-pipeline.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-codepipeline-pipeline.json index c30673ec3d..288daa81a1 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-codepipeline-pipeline.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-codepipeline-pipeline.json @@ -11,7 +11,10 @@ "$ref": "#/definitions/ActionTypeId" }, "Configuration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "InputArtifacts": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cognito-identitypool.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cognito-identitypool.json index 63147e3368..27440ea263 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cognito-identitypool.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cognito-identitypool.json @@ -98,7 +98,10 @@ "type": "boolean" }, "CognitoEvents": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CognitoIdentityProviders": { "insertionOrder": false, @@ -143,7 +146,10 @@ "uniqueItems": false }, "SupportedLoginProviders": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-controltower-enabledcontrol.json index 1999a1aacf..cae81c46bc 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-dlm-lifecyclepolicy.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-dlm-lifecyclepolicy.json index 193cdf090a..80e7e58b3d 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-dlm-lifecyclepolicy.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-dlm-lifecyclepolicy.json @@ -159,7 +159,10 @@ "type": "object" }, "CrossRegionCopyTargets": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DeprecateRule": { "additionalProperties": false, @@ -230,10 +233,16 @@ "type": "object" }, "ExcludeTags": { - "type": "object" + "type": [ + "object", + "string" + ] }, "ExcludeVolumeTypesList": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Exclusions": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-docdb-dbclusterparametergroup.json index ba36753546..0b881de5f6 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-channel.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-channel.json index 35f748c442..0283ba3ed1 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-channel.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-channel.json @@ -58,7 +58,10 @@ "type": "object" }, "ServiceManagedS3": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tag": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-datastore.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-datastore.json index 71645fa464..b915db1b0e 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-datastore.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotanalytics-datastore.json @@ -133,7 +133,10 @@ "type": "object" }, "JsonConfiguration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "ParquetConfiguration": { "additionalProperties": false, @@ -188,7 +191,10 @@ "type": "object" }, "ServiceManagedS3": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tag": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-permissions.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-permissions.json index d3ca548d76..00f5a8a794 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-permissions.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-permissions.json @@ -88,7 +88,10 @@ "type": "object" }, "TableWildcard": { - "type": "object" + "type": [ + "object", + "string" + ] }, "TableWithColumnsResource": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-principalpermissions.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-principalpermissions.json index a01ab6445c..a41ac0fd61 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-principalpermissions.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-principalpermissions.json @@ -346,7 +346,10 @@ "type": "object" }, "TableWildcard": { - "type": "object" + "type": [ + "object", + "string" + ] }, "TableWithColumnsResource": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-tagassociation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-tagassociation.json index 078a320a3c..4d69417ad5 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-tagassociation.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-lakeformation-tagassociation.json @@ -140,7 +140,10 @@ "type": "object" }, "TableWildcard": { - "type": "object" + "type": [ + "object", + "string" + ] }, "TableWithColumnsResource": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-medialive-channel.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-medialive-channel.json index b8e9b541f9..3318906a75 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-medialive-channel.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-medialive-channel.json @@ -137,10 +137,16 @@ "type": "object" }, "AribDestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AribSourceSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AudioChannelMapping": { "additionalProperties": false, @@ -749,10 +755,16 @@ "type": "object" }, "ColorSpacePassthroughSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DolbyVision81Settings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DvbNitSettings": { "additionalProperties": false, @@ -977,10 +989,16 @@ "type": "object" }, "EmbeddedDestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "EmbeddedPlusScte20DestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "EmbeddedSourceSettings": { "additionalProperties": false, @@ -1188,7 +1206,10 @@ "type": "object" }, "FrameCaptureHlsSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "FrameCaptureOutputSettings": { "additionalProperties": false, @@ -1880,7 +1901,10 @@ "type": "object" }, "HtmlMotionGraphicsSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "InputAttachment": { "additionalProperties": false, @@ -2272,7 +2296,10 @@ "type": "object" }, "MediaPackageOutputSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "MotionGraphicsConfiguration": { "additionalProperties": false, @@ -2452,7 +2479,10 @@ "type": "object" }, "MultiplexGroupSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "MultiplexOutputSettings": { "additionalProperties": false, @@ -2724,19 +2754,34 @@ "type": "object" }, "PassThroughSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "PipelineLockingSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RawSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Rec601Settings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Rec709Settings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RemixSettings": { "additionalProperties": false, @@ -2758,7 +2803,10 @@ "type": "object" }, "RtmpCaptionInfoDestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RtmpGroupSettings": { "additionalProperties": false, @@ -2813,7 +2861,10 @@ "type": "object" }, "Scte20PlusEmbeddedDestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Scte20SourceSettings": { "additionalProperties": false, @@ -2828,7 +2879,10 @@ "type": "object" }, "Scte27DestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Scte27SourceSettings": { "additionalProperties": false, @@ -2873,7 +2927,10 @@ "type": "object" }, "SmpteTtDestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "StandardHlsSettings": { "additionalProperties": false, @@ -2900,7 +2957,10 @@ "type": "object" }, "TeletextDestinationSettings": { - "type": "object" + "type": [ + "object", + "string" + ] }, "TeletextSourceSettings": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbclusterparametergroup.json index 59272dc2fa..9302ad6d5e 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbparametergroup.json index fa0daf9ff7..02835d0d26 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-layer.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-layer.json index 8c82d08581..3d9a8bb659 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-layer.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-layer.json @@ -181,7 +181,10 @@ "type": "string" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "CustomRecipes": { "$ref": "#/definitions/Recipes" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-stack.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-stack.json index 8eadf8a49b..c654f7d9ea 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-stack.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-opsworks-stack.json @@ -148,7 +148,10 @@ "$ref": "#/definitions/Source" }, "CustomJson": { - "type": "object" + "type": [ + "object", + "string" + ] }, "DefaultAvailabilityZone": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-app.json index a7038f5ba5..99e760001f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-segment.json index 62b36b5765..71733a1a7c 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-plugin.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-plugin.json index 376aa802df..21b8251e2f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-plugin.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-plugin.json @@ -86,7 +86,10 @@ "type": "object" }, "NoAuthConfiguration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "OAuth2ClientCredentialConfiguration": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-analysis.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-analysis.json index 1af49a9790..f5ac271c04 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-analysis.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-analysis.json @@ -43,7 +43,10 @@ "type": "object" }, "AllSheetsFilterScopeConfiguration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AnalysisDefaults": { "additionalProperties": false, @@ -316,7 +319,10 @@ "type": "object" }, "AxisDisplayDataDrivenRange": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AxisDisplayMinMaxRange": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-dashboard.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-dashboard.json index 679fa5eb32..363e0544b9 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-dashboard.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-dashboard.json @@ -52,7 +52,10 @@ "type": "object" }, "AllSheetsFilterScopeConfiguration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AnalysisDefaults": { "additionalProperties": false, @@ -197,7 +200,10 @@ "type": "object" }, "AxisDisplayDataDrivenRange": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AxisDisplayMinMaxRange": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-template.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-template.json index 7d65cd7e42..1580a87bfd 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-template.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-template.json @@ -43,7 +43,10 @@ "type": "object" }, "AllSheetsFilterScopeConfiguration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AnalysisDefaults": { "additionalProperties": false, @@ -188,7 +191,10 @@ "type": "object" }, "AxisDisplayDataDrivenRange": { - "type": "object" + "type": [ + "object", + "string" + ] }, "AxisDisplayMinMaxRange": { "additionalProperties": false, diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-model.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-model.json index c17fb93fff..8122317a63 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-model.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-model.json @@ -25,7 +25,10 @@ "type": "string" }, "Schema": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-restapi.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-restapi.json index 76a7d9ffcc..26d3794e3b 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-restapi.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigateway-restapi.json @@ -75,7 +75,10 @@ "uniqueItems": true }, "Body": { - "type": "object" + "type": [ + "object", + "string" + ] }, "BodyS3Location": { "$ref": "#/definitions/S3Location" @@ -116,7 +119,10 @@ "type": "object" }, "Policy": { - "type": "object" + "type": [ + "object", + "string" + ] }, "RootResourceId": { "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codepipeline-pipeline.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codepipeline-pipeline.json index 97d26f6088..4575c69e2a 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codepipeline-pipeline.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codepipeline-pipeline.json @@ -11,7 +11,10 @@ "$ref": "#/definitions/ActionTypeId" }, "Configuration": { - "type": "object" + "type": [ + "object", + "string" + ] }, "InputArtifacts": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-apigatewayv2-vpclink.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-apigatewayv2-vpclink.json index 1b5fa4c74d..7e1ebb78bc 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-apigatewayv2-vpclink.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-apigatewayv2-vpclink.json @@ -31,7 +31,10 @@ "uniqueItems": false }, "Tags": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-controltower-enabledcontrol.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-controltower-enabledcontrol.json index 75018496ac..fcd9f3325b 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-controltower-enabledcontrol.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-controltower-enabledcontrol.json @@ -12,40 +12,22 @@ "type": "string" }, "Value": { - "anyOf": [ - { - "insertionOrder": false, - "items": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } - ] - }, - "minItems": 1, - "type": "array" - }, - { - "type": "string" - }, - { - "type": "number" - }, - { - "type": "object" - }, - { - "type": "boolean" - } + "insertionOrder": false, + "items": { + "type": [ + "string", + "number", + "object", + "boolean" + ] + }, + "minItems": 1, + "type": [ + "array", + "string", + "number", + "object", + "boolean" ] } }, diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-docdb-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-docdb-dbclusterparametergroup.json index a7815b3030..b3e75356b1 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-docdb-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-docdb-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-app.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-app.json index af8ce90d32..444ed27dd6 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-app.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-app.json @@ -17,7 +17,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-segment.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-segment.json index 6ea1a3f3a5..3763227d9e 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-segment.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-pinpoint-segment.json @@ -127,7 +127,10 @@ "additionalProperties": false, "properties": { "Attributes": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Behavior": { "$ref": "#/definitions/Behavior" @@ -139,10 +142,16 @@ "$ref": "#/definitions/Location" }, "Metrics": { - "type": "object" + "type": [ + "object", + "string" + ] }, "UserAttributes": { - "type": "object" + "type": [ + "object", + "string" + ] } }, "type": "object" @@ -218,7 +227,9 @@ "type": "string" }, "Tags": { - "type": "object" + "type": [ + "object" + ] } }, "readOnlyProperties": [ diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbclusterparametergroup.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbclusterparametergroup.json index 5fb55df453..342bd6c0d3 100644 --- a/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbclusterparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbclusterparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbparametergroup.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbparametergroup.json index 7fdfd03c3a..682c0be2c3 100644 --- a/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbparametergroup.json +++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-neptune-dbparametergroup.json @@ -40,7 +40,10 @@ "type": "string" }, "Parameters": { - "type": "object" + "type": [ + "object", + "string" + ] }, "Tags": { "items": { diff --git a/test/fixtures/schemas/providers/base.definition.schema.v1.json b/test/fixtures/schemas/providers/base.definition.schema.v1.json index c3b464bec6..50ef41659e 100644 --- a/test/fixtures/schemas/providers/base.definition.schema.v1.json +++ b/test/fixtures/schemas/providers/base.definition.schema.v1.json @@ -78,6 +78,14 @@ { "$comment": "The following subset of draft-07 property references is supported for resource definitions. Nested properties are disallowed and should be specified as a $ref to a definitions block.", "type": ["object", "boolean"], + "not": { + "additionalProperties": false, + "properties": { + "type": { + "const": "object" + } + } + }, "properties": { "insertionOrder": { "description": "When set to true, this flag indicates that the order of insertion of the array will be honored, and that changing the order of the array would indicate a diff",