From 6297efedcccaca081c2b4c3bfd9623fc5bed2fe3 Mon Sep 17 00:00:00 2001
From: Kevin DeJong <kddejong@amazon.com>
Date: Fri, 18 Oct 2024 08:19:51 -0700
Subject: [PATCH] Patch schemas

---
 .../af_south_1/aws-events-connection.json     |   7 +
 .../af_south_1/aws-iot-topicrule.json         |  14 +
 .../af_south_1/aws-route53-healthcheck.json   |  39 +
 .../ap_east_1/aws-events-connection.json      |   7 +
 .../ap_northeast_1/aws-events-connection.json |   7 +
 .../ap_northeast_2/aws-events-connection.json |   7 +
 .../ap_northeast_3/aws-iot-topicrule.json     |  14 +
 .../aws-ssm-resourcedatasync.json             |   3 +
 .../ap_south_1/aws-events-connection.json     |   7 +
 .../ap_south_1/aws-ssm-resourcedatasync.json  |   3 +
 .../ap_south_2/aws-iot-topicrule.json         |  14 +
 .../ap_south_2/aws-route53-healthcheck.json   |  39 +
 .../ap_southeast_1/aws-events-connection.json |   7 +
 .../ap_southeast_2/aws-events-connection.json |   7 +
 .../aws-iotsitewise-portal.json               |   2 +
 .../ap_southeast_3/aws-iot-topicrule.json     |  14 +
 .../aws-route53-healthcheck.json              |  39 +
 .../aws-ssm-resourcedatasync.json             |   3 +
 .../aws-appsync-datasource.json               |   6 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../ap_southeast_4/aws-iot-topicrule.json     |  14 +
 .../aws-route53-healthcheck.json              |  39 +
 ...-applicationautoscaling-scalingpolicy.json |  17 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../aws-codedeploy-deploymentconfig.json      |   5 +
 .../ap_southeast_5/aws-ecs-service.json       |  10 +
 .../ap_southeast_5/aws-iot-topicrule.json     |  14 +
 .../aws-route53-healthcheck.json              |  39 +
 .../ca_central_1/aws-events-connection.json   |   7 +
 ...-applicationautoscaling-scalingpolicy.json |  17 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../providers/ca_west_1/aws-ecs-service.json  |  10 +
 .../ca_west_1/aws-iot-topicrule.json          |  14 +
 .../ca_west_1/aws-redshift-integration.json   |   1 +
 .../ca_west_1/aws-route53-healthcheck.json    |  39 +
 .../cn_north_1/aws-iotsitewise-portal.json    |   2 +
 .../aws-lambda-eventsourcemapping.json        |   2 +
 .../cn_north_1/aws-route53-healthcheck.json   |  39 +
 .../cn_north_1/aws-ssm-resourcedatasync.json  |   3 +
 .../cn_north_1/aws-synthetics-canary.json     |   6 +
 .../cn_northwest_1/aws-ecs-service.json       |  10 +
 .../aws-lambda-eventsourcemapping.json        |   2 +
 .../aws-route53-healthcheck.json              |  39 +
 .../aws-ssm-resourcedatasync.json             |   3 +
 .../cn_northwest_1/aws-synthetics-canary.json |   6 +
 .../aws-autoscaling-autoscalinggroup.json     |   5 +-
 .../eu_central_1/aws-ec2-launchtemplate.json  | 873 ++++++++++++++++++
 .../eu_central_1/aws-events-connection.json   |   7 +
 .../aws-redshift-integration.json             |   1 +
 .../eu_central_2/aws-ecs-service.json         |  10 +
 .../eu_central_2/aws-iot-topicrule.json       |  14 +
 .../aws-redshift-integration.json             |   1 +
 .../eu_central_2/aws-route53-healthcheck.json |  39 +
 .../eu_north_1/aws-events-connection.json     |   7 +
 .../providers/eu_south_1/aws-ecs-service.json |  10 +
 .../eu_south_1/aws-events-connection.json     |   7 +
 .../eu_south_1/aws-iot-topicrule.json         |  14 +
 .../eu_south_1/aws-route53-healthcheck.json   |  39 +
 .../eu_south_2/aws-iot-topicrule.json         |  14 +
 .../eu_south_2/aws-route53-healthcheck.json   |  39 +
 .../eu_west_1/aws-events-connection.json      |   7 +
 .../eu_west_2/aws-events-connection.json      |   7 +
 .../eu_west_2/aws-ssm-resourcedatasync.json   |   3 +
 .../eu_west_3/aws-events-connection.json      |   7 +
 .../il_central_1/aws-appsync-datasource.json  |   6 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../il_central_1/aws-ecs-cluster.json         |   5 +
 .../il_central_1/aws-ecs-service.json         |  10 +
 .../il_central_1/aws-iot-topicrule.json       |  14 +
 .../il_central_1/aws-route53-healthcheck.json |  39 +
 .../me_central_1/aws-route53-healthcheck.json |  39 +
 .../sa_east_1/aws-events-connection.json      |   7 +
 .../aws-networkmanager-connectattachment.json |   4 +
 .../aws-acmpca-certificateauthority.json      |   7 +
 .../providers/us_east_1/aws-amplify-app.json  |   1 +
 .../us_east_1/aws-amplify-branch.json         |   1 +
 .../aws-appflow-connectorprofile.json         |   2 +
 ...-applicationautoscaling-scalingpolicy.json |  17 +
 .../us_east_1/aws-apprunner-service.json      |   3 +
 .../us_east_1/aws-appstream-appblock.json     |   1 +
 .../us_east_1/aws-appstream-application.json  |   1 +
 .../aws-appstream-directoryconfig.json        |   6 +
 .../us_east_1/aws-appsync-datasource.json     |   6 +
 .../aws-appsync-functionconfiguration.json    |  13 +
 .../us_east_1/aws-appsync-resolver.json       |  13 +
 .../aws-auditmanager-assessment.json          |   1 +
 .../aws-autoscaling-autoscalinggroup.json     |   1 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../us_east_1/aws-backup-backupselection.json |   1 +
 .../aws-batch-computeenvironment.json         |  12 +
 .../us_east_1/aws-budgets-budgetsaction.json  |   3 +
 .../aws-cleanrooms-idmappingtable.json        |   1 +
 ...aws-cleanrooms-idnamespaceassociation.json |   1 +
 .../us_east_1/aws-cleanrooms-membership.json  |   3 +
 .../aws-cloudformation-hookversion.json       |   1 +
 .../aws-cloudformation-resourceversion.json   |   1 +
 .../aws-cloudfront-distribution.json          |  10 +
 .../us_east_1/aws-cloudfront-function.json    |   4 +
 .../aws-cloudfront-keyvaluestore.json         |   3 +
 .../aws-codedeploy-deploymentconfig.json      |   9 +
 .../us_east_1/aws-comprehend-flywheel.json    |   1 +
 .../us_east_1/aws-config-conformancepack.json |   2 +
 .../providers/us_east_1/aws-connect-user.json |   1 +
 .../providers/us_east_1/aws-databrew-job.json |   1 +
 .../us_east_1/aws-datazone-datasource.json    |  66 ++
 .../us_east_1/aws-deadline-queue.json         |   1 +
 .../us_east_1/aws-dynamodb-globaltable.json   |   6 +
 .../providers/us_east_1/aws-ec2-ipampool.json |   3 +
 .../us_east_1/aws-ec2-launchtemplate.json     | 873 ++++++++++++++++++
 .../aws-ec2-transitgatewayattachment.json     |  16 +
 .../aws-ec2-transitgatewayconnect.json        |   3 +
 ...aws-ec2-transitgatewaymulticastdomain.json |  12 +
 .../aws-ec2-transitgatewayvpcattachment.json  |  16 +
 .../aws-ec2-verifiedaccessendpoint.json       |   8 +
 .../aws-ecr-repositorycreationtemplate.json   |   1 +
 .../providers/us_east_1/aws-ecs-cluster.json  |   5 +
 .../providers/us_east_1/aws-ecs-service.json  |  10 +
 .../us_east_1/aws-ecs-taskdefinition.json     |  14 +
 .../us_east_1/aws-efs-accesspoint.json        |   1 +
 .../aws-emrcontainers-virtualcluster.json     |   3 +
 ...ws-entityresolution-idmappingworkflow.json |   1 +
 ...aws-entityresolution-matchingworkflow.json |   2 +
 .../us_east_1/aws-events-connection.json      |   7 +
 .../us_east_1/aws-finspace-environment.json   |   1 +
 .../us_east_1/aws-fis-experimenttemplate.json |   3 +
 .../aws-gamelift-gameservergroup.json         |   1 +
 .../providers/us_east_1/aws-glue-crawler.json |   5 +
 .../providers/us_east_1/aws-glue-job.json     |   1 +
 .../aws-guardduty-malwareprotectionplan.json  |   4 +
 .../aws-imagebuilder-imagerecipe.json         |   1 +
 .../aws-iot-domainconfiguration.json          |   2 +
 .../us_east_1/aws-iot-fleetmetric.json        |   5 +
 .../aws-iot-provisioningtemplate.json         |   1 +
 .../us_east_1/aws-iot-topicrule.json          |  15 +
 .../aws-iotsitewise-accesspolicy.json         |   5 +
 .../us_east_1/aws-iotsitewise-gateway.json    |   3 +
 .../us_east_1/aws-iotsitewise-portal.json     |   2 +
 .../us_east_1/aws-iotwireless-fuotatask.json  |  15 +
 .../aws-iotwireless-multicastgroup.json       |  19 +
 .../us_east_1/aws-kendra-datasource.json      |   1 +
 .../aws-kinesisfirehose-deliverystream.json   |  37 +
 .../aws-lambda-eventsourcemapping.json        |   2 +
 .../us_east_1/aws-licensemanager-license.json |   7 +
 .../us_east_1/aws-lightsail-distribution.json |  38 +
 ...s-lookoutequipment-inferencescheduler.json |   1 +
 .../providers/us_east_1/aws-msk-cluster.json  |   3 +
 .../aws-networkmanager-connectattachment.json |   4 +
 .../us_east_1/aws-networkmanager-device.json  |   5 +
 .../us_east_1/aws-networkmanager-site.json    |   3 +
 .../providers/us_east_1/aws-pipes-pipe.json   |   1 +
 .../aws-quicksight-refreshschedule.json       |   1 +
 .../us_east_1/aws-resourcegroups-group.json   |   1 +
 .../us_east_1/aws-route53-healthcheck.json    |  39 +
 .../providers/us_east_1/aws-s3-bucket.json    |   3 +
 .../us_east_1/aws-sagemaker-cluster.json      |   1 +
 ...ws-sagemaker-dataqualityjobdefinition.json |  63 ++
 .../us_east_1/aws-sagemaker-featuregroup.json |   1 +
 .../aws-sagemaker-modelbiasjobdefinition.json |  63 ++
 ...aker-modelexplainabilityjobdefinition.json |  63 ++
 ...s-sagemaker-modelqualityjobdefinition.json |  63 ++
 .../aws-sagemaker-monitoringschedule.json     |  63 ++
 .../us_east_1/aws-ssm-resourcedatasync.json   |   3 +
 .../us_east_1/aws-synthetics-canary.json      |   6 +
 .../us_east_1/aws-wafv2-rulegroup.json        |   1 +
 .../providers/us_east_1/aws-wafv2-webacl.json |   1 +
 .../us_east_2/aws-events-connection.json      |   7 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../us_gov_east_1/aws-ecs-service.json        |  10 +
 .../us_gov_east_1/aws-glue-crawler.json       |   5 +
 .../providers/us_gov_east_1/aws-glue-job.json |   1 +
 .../aws-lambda-eventsourcemapping.json        |   2 +
 .../aws-route53-healthcheck.json              |  39 +
 .../us_gov_east_1/aws-synthetics-canary.json  |   6 +
 .../us_gov_east_1/aws-wafv2-rulegroup.json    |   1 +
 .../us_gov_east_1/aws-wafv2-webacl.json       |   1 +
 .../aws-autoscaling-launchconfiguration.json  |   8 +
 .../aws-autoscaling-scalingpolicy.json        |   8 +
 .../us_gov_west_1/aws-ecs-service.json        |  10 +
 .../us_gov_west_1/aws-glue-crawler.json       |   5 +
 .../providers/us_gov_west_1/aws-glue-job.json |   1 +
 .../us_gov_west_1/aws-iotsitewise-portal.json |   2 +
 .../aws-lambda-eventsourcemapping.json        |   2 +
 .../aws-route53-healthcheck.json              |  39 +
 .../aws-ssm-resourcedatasync.json             |   3 +
 .../us_gov_west_1/aws-synthetics-canary.json  |   6 +
 .../us_gov_west_1/aws-wafv2-rulegroup.json    |   1 +
 .../us_gov_west_1/aws-wafv2-webacl.json       |   1 +
 .../us_west_1/aws-appsync-datasource.json     |   6 +
 .../us_west_1/aws-events-connection.json      |   7 +
 .../us_west_1/aws-ssm-resourcedatasync.json   |   3 +
 .../us_west_2/aws-events-connection.json      |   7 +
 .../us_west_2/aws-iotsitewise-portal.json     |   2 +
 198 files changed, 3815 insertions(+), 1 deletion(-)

diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/af_south_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/af_south_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ssm-resourcedatasync.json
index 4ca9deebb1..3a9d119fb6 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ssm-resourcedatasync.json
@@ -46,6 +46,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ssm-resourcedatasync.json
index ec87640906..c3bbb7edbe 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ssm-resourcedatasync.json
@@ -56,6 +56,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "maxLength": 1024,
      "minLength": 1,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-portal.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-portal.json
index 68f42ea09d..8f5a9706e1 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-portal.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-portal.json
@@ -34,9 +34,11 @@
    "additionalProperties": false,
    "properties": {
     "AlarmRoleArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     },
     "NotificationLambdaArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ssm-resourcedatasync.json
index 4ca9deebb1..3a9d119fb6 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ssm-resourcedatasync.json
@@ -46,6 +46,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-appsync-datasource.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-appsync-datasource.json
index 06c91688b2..465e8de1f5 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-appsync-datasource.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-appsync-datasource.json
@@ -9,6 +9,9 @@
    "additionalProperties": false,
    "properties": {
     "AuthorizationType": {
+     "enum": [
+      "AWS_IAM"
+     ],
      "type": "string"
     },
     "AwsIamConfig": {
@@ -181,6 +184,9 @@
      "$ref": "#/definitions/RdsHttpEndpointConfig"
     },
     "RelationalDatabaseSourceType": {
+     "enum": [
+      "RDS_HTTP_ENDPOINT"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json
index 33366dff06..944f5608ad 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-scalingpolicy.json
index 3ec51d0018..f9f928f78e 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-scalingpolicy.json
@@ -145,6 +145,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -158,6 +162,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-applicationautoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-applicationautoscaling-scalingpolicy.json
index e04d931f21..e33ce82e03 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-applicationautoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-applicationautoscaling-scalingpolicy.json
@@ -32,6 +32,13 @@
      "type": "string"
     },
     "Statistic": {
+     "enum": [
+      "Average",
+      "Maximum",
+      "Minimum",
+      "SampleCount",
+      "Sum"
+     ],
      "type": "string"
     },
     "Unit": {
@@ -122,12 +129,22 @@
    "additionalProperties": false,
    "properties": {
     "AdjustmentType": {
+     "enum": [
+      "ChangeInCapacity",
+      "ExactCapacity",
+      "PercentChangeInCapacity"
+     ],
      "type": "string"
     },
     "Cooldown": {
      "type": "integer"
     },
     "MetricAggregationType": {
+     "enum": [
+      "Average",
+      "Maximum",
+      "Minimum"
+     ],
      "type": "string"
     },
     "MinAdjustmentMagnitude": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json
index 33366dff06..944f5608ad 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-scalingpolicy.json
index 3ec51d0018..f9f928f78e 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-scalingpolicy.json
@@ -145,6 +145,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -158,6 +162,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-codedeploy-deploymentconfig.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-codedeploy-deploymentconfig.json
index 97c0a017a7..5643a4cc13 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-codedeploy-deploymentconfig.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-codedeploy-deploymentconfig.json
@@ -69,6 +69,11 @@
      "$ref": "#/definitions/TimeBasedLinear"
     },
     "Type": {
+     "enum": [
+      "AllAtOnce",
+      "TimeBasedCanary",
+      "TimeBasedLinear"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-applicationautoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-applicationautoscaling-scalingpolicy.json
index e04d931f21..e33ce82e03 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-applicationautoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-applicationautoscaling-scalingpolicy.json
@@ -32,6 +32,13 @@
      "type": "string"
     },
     "Statistic": {
+     "enum": [
+      "Average",
+      "Maximum",
+      "Minimum",
+      "SampleCount",
+      "Sum"
+     ],
      "type": "string"
     },
     "Unit": {
@@ -122,12 +129,22 @@
    "additionalProperties": false,
    "properties": {
     "AdjustmentType": {
+     "enum": [
+      "ChangeInCapacity",
+      "ExactCapacity",
+      "PercentChangeInCapacity"
+     ],
      "type": "string"
     },
     "Cooldown": {
      "type": "integer"
     },
     "MetricAggregationType": {
+     "enum": [
+      "Average",
+      "Maximum",
+      "Minimum"
+     ],
      "type": "string"
     },
     "MinAdjustmentMagnitude": {
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json
index 33366dff06..944f5608ad 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-scalingpolicy.json
index 3ec51d0018..f9f928f78e 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-scalingpolicy.json
@@ -145,6 +145,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -158,6 +162,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-redshift-integration.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-redshift-integration.json
index a3df6f7445..0aa07b1c20 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-redshift-integration.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-redshift-integration.json
@@ -63,6 +63,7 @@
   "IntegrationName": {
    "maxLength": 64,
    "minLength": 1,
+   "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$",
    "type": "string"
   },
   "KMSKeyId": {
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-iotsitewise-portal.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-iotsitewise-portal.json
index 68f42ea09d..8f5a9706e1 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-iotsitewise-portal.json
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-iotsitewise-portal.json
@@ -34,9 +34,11 @@
    "additionalProperties": false,
    "properties": {
     "AlarmRoleArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     },
     "NotificationLambdaArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-lambda-eventsourcemapping.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-lambda-eventsourcemapping.json
index fa5a0cde41..8badd3c93f 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-lambda-eventsourcemapping.json
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-lambda-eventsourcemapping.json
@@ -39,11 +39,13 @@
     "CollectionName": {
      "maxLength": 57,
      "minLength": 1,
+     "pattern": "(^(?!(system\\x2e)))(^[_a-zA-Z0-9])([^$]*)",
      "type": "string"
     },
     "DatabaseName": {
      "maxLength": 63,
      "minLength": 1,
+     "pattern": "[^ /\\.$\\x22]*",
      "type": "string"
     },
     "FullDocument": {
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-ssm-resourcedatasync.json
index 4ca9deebb1..3a9d119fb6 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-ssm-resourcedatasync.json
@@ -46,6 +46,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json
index 39efc725c3..2cdb5bba30 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json
@@ -47,6 +47,7 @@
    ],
    "properties": {
     "Handler": {
+     "pattern": "^([0-9a-zA-Z_-]+\\/)*[0-9A-Za-z_\\\\-]+\\.[A-Za-z_][A-Za-z0-9_]*$",
      "type": "string"
     },
     "S3Bucket": {
@@ -98,9 +99,14 @@
    "additionalProperties": false,
    "properties": {
     "EncryptionMode": {
+     "enum": [
+      "SSE_KMS",
+      "SSE_S3"
+     ],
      "type": "string"
     },
     "KmsKeyArn": {
+     "pattern": "arn:(aws[a-zA-Z-]*)?:kms:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:key/[\\w\\-\\/]+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-lambda-eventsourcemapping.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-lambda-eventsourcemapping.json
index fa5a0cde41..8badd3c93f 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-lambda-eventsourcemapping.json
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-lambda-eventsourcemapping.json
@@ -39,11 +39,13 @@
     "CollectionName": {
      "maxLength": 57,
      "minLength": 1,
+     "pattern": "(^(?!(system\\x2e)))(^[_a-zA-Z0-9])([^$]*)",
      "type": "string"
     },
     "DatabaseName": {
      "maxLength": 63,
      "minLength": 1,
+     "pattern": "[^ /\\.$\\x22]*",
      "type": "string"
     },
     "FullDocument": {
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ssm-resourcedatasync.json
index 4ca9deebb1..3a9d119fb6 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ssm-resourcedatasync.json
@@ -46,6 +46,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-synthetics-canary.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-synthetics-canary.json
index 39efc725c3..2cdb5bba30 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-synthetics-canary.json
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-synthetics-canary.json
@@ -47,6 +47,7 @@
    ],
    "properties": {
     "Handler": {
+     "pattern": "^([0-9a-zA-Z_-]+\\/)*[0-9A-Za-z_\\\\-]+\\.[A-Za-z_][A-Za-z0-9_]*$",
      "type": "string"
     },
     "S3Bucket": {
@@ -98,9 +99,14 @@
    "additionalProperties": false,
    "properties": {
     "EncryptionMode": {
+     "enum": [
+      "SSE_KMS",
+      "SSE_S3"
+     ],
      "type": "string"
     },
     "KmsKeyArn": {
+     "pattern": "arn:(aws[a-zA-Z-]*)?:kms:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:key/[\\w\\-\\/]+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json
index 2a0eaf3daf..f1eaa50826 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json
@@ -258,6 +258,7 @@
      "type": "string"
     },
     "LaunchTemplateName": {
+     "pattern": "[a-zA-Z0-9\\(\\)\\.\\-/_]+",
      "type": "string"
     },
     "Version": {
@@ -516,8 +517,10 @@
   },
   "HealthCheckType": {
    "enum": [
+    "EBS",
     "EC2",
-    "ELB"
+    "ELB",
+    "VPC_LATTICE"
    ],
    "type": "string"
   },
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json
index 695f0cffe8..56cddb2f33 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-launchtemplate.json
@@ -68,6 +68,10 @@
    "additionalProperties": false,
    "properties": {
     "CapacityReservationPreference": {
+     "enum": [
+      "none",
+      "open"
+     ],
      "type": "string"
     },
     "CapacityReservationTarget": {
@@ -284,12 +288,22 @@
      "uniqueItems": false
     },
     "BareMetal": {
+     "enum": [
+      "excluded",
+      "included",
+      "required"
+     ],
      "type": "string"
     },
     "BaselineEbsBandwidthMbps": {
      "$ref": "#/definitions/BaselineEbsBandwidthMbps"
     },
     "BurstablePerformance": {
+     "enum": [
+      "excluded",
+      "included",
+      "required"
+     ],
      "type": "string"
     },
     "CpuManufacturers": {
@@ -314,6 +328,11 @@
      "uniqueItems": false
     },
     "LocalStorage": {
+     "enum": [
+      "excluded",
+      "included",
+      "required"
+     ],
      "type": "string"
     },
     "LocalStorageTypes": {
@@ -452,6 +471,836 @@
      "$ref": "#/definitions/InstanceRequirements"
     },
     "InstanceType": {
+     "enum": [
+      "a1.2xlarge",
+      "a1.4xlarge",
+      "a1.large",
+      "a1.medium",
+      "a1.metal",
+      "a1.xlarge",
+      "c1.medium",
+      "c1.xlarge",
+      "c3.2xlarge",
+      "c3.4xlarge",
+      "c3.8xlarge",
+      "c3.large",
+      "c3.xlarge",
+      "c4.2xlarge",
+      "c4.4xlarge",
+      "c4.8xlarge",
+      "c4.large",
+      "c4.xlarge",
+      "c5.12xlarge",
+      "c5.18xlarge",
+      "c5.24xlarge",
+      "c5.2xlarge",
+      "c5.4xlarge",
+      "c5.9xlarge",
+      "c5.large",
+      "c5.metal",
+      "c5.xlarge",
+      "c5a.12xlarge",
+      "c5a.16xlarge",
+      "c5a.24xlarge",
+      "c5a.2xlarge",
+      "c5a.4xlarge",
+      "c5a.8xlarge",
+      "c5a.large",
+      "c5a.xlarge",
+      "c5ad.12xlarge",
+      "c5ad.16xlarge",
+      "c5ad.24xlarge",
+      "c5ad.2xlarge",
+      "c5ad.4xlarge",
+      "c5ad.8xlarge",
+      "c5ad.large",
+      "c5ad.xlarge",
+      "c5d.12xlarge",
+      "c5d.18xlarge",
+      "c5d.24xlarge",
+      "c5d.2xlarge",
+      "c5d.4xlarge",
+      "c5d.9xlarge",
+      "c5d.large",
+      "c5d.metal",
+      "c5d.xlarge",
+      "c5n.18xlarge",
+      "c5n.2xlarge",
+      "c5n.4xlarge",
+      "c5n.9xlarge",
+      "c5n.large",
+      "c5n.metal",
+      "c5n.xlarge",
+      "c6a.12xlarge",
+      "c6a.16xlarge",
+      "c6a.24xlarge",
+      "c6a.2xlarge",
+      "c6a.32xlarge",
+      "c6a.48xlarge",
+      "c6a.4xlarge",
+      "c6a.8xlarge",
+      "c6a.large",
+      "c6a.metal",
+      "c6a.xlarge",
+      "c6g.12xlarge",
+      "c6g.16xlarge",
+      "c6g.2xlarge",
+      "c6g.4xlarge",
+      "c6g.8xlarge",
+      "c6g.large",
+      "c6g.medium",
+      "c6g.metal",
+      "c6g.xlarge",
+      "c6gd.12xlarge",
+      "c6gd.16xlarge",
+      "c6gd.2xlarge",
+      "c6gd.4xlarge",
+      "c6gd.8xlarge",
+      "c6gd.large",
+      "c6gd.medium",
+      "c6gd.metal",
+      "c6gd.xlarge",
+      "c6gn.12xlarge",
+      "c6gn.16xlarge",
+      "c6gn.2xlarge",
+      "c6gn.4xlarge",
+      "c6gn.8xlarge",
+      "c6gn.large",
+      "c6gn.medium",
+      "c6gn.xlarge",
+      "c6i.12xlarge",
+      "c6i.16xlarge",
+      "c6i.24xlarge",
+      "c6i.2xlarge",
+      "c6i.32xlarge",
+      "c6i.4xlarge",
+      "c6i.8xlarge",
+      "c6i.large",
+      "c6i.metal",
+      "c6i.xlarge",
+      "c6id.12xlarge",
+      "c6id.16xlarge",
+      "c6id.24xlarge",
+      "c6id.2xlarge",
+      "c6id.32xlarge",
+      "c6id.4xlarge",
+      "c6id.8xlarge",
+      "c6id.large",
+      "c6id.metal",
+      "c6id.xlarge",
+      "c6in.12xlarge",
+      "c6in.16xlarge",
+      "c6in.24xlarge",
+      "c6in.2xlarge",
+      "c6in.32xlarge",
+      "c6in.4xlarge",
+      "c6in.8xlarge",
+      "c6in.large",
+      "c6in.metal",
+      "c6in.xlarge",
+      "c7a.12xlarge",
+      "c7a.16xlarge",
+      "c7a.24xlarge",
+      "c7a.2xlarge",
+      "c7a.32xlarge",
+      "c7a.48xlarge",
+      "c7a.4xlarge",
+      "c7a.8xlarge",
+      "c7a.large",
+      "c7a.medium",
+      "c7a.metal-48xl",
+      "c7a.xlarge",
+      "c7g.12xlarge",
+      "c7g.16xlarge",
+      "c7g.2xlarge",
+      "c7g.4xlarge",
+      "c7g.8xlarge",
+      "c7g.large",
+      "c7g.medium",
+      "c7g.metal",
+      "c7g.xlarge",
+      "c7gd.12xlarge",
+      "c7gd.16xlarge",
+      "c7gd.2xlarge",
+      "c7gd.4xlarge",
+      "c7gd.8xlarge",
+      "c7gd.large",
+      "c7gd.medium",
+      "c7gd.metal",
+      "c7gd.xlarge",
+      "c7gn.12xlarge",
+      "c7gn.16xlarge",
+      "c7gn.2xlarge",
+      "c7gn.4xlarge",
+      "c7gn.8xlarge",
+      "c7gn.large",
+      "c7gn.medium",
+      "c7gn.metal",
+      "c7gn.xlarge",
+      "c7i-flex.2xlarge",
+      "c7i-flex.4xlarge",
+      "c7i-flex.8xlarge",
+      "c7i-flex.large",
+      "c7i-flex.xlarge",
+      "c7i.12xlarge",
+      "c7i.16xlarge",
+      "c7i.24xlarge",
+      "c7i.2xlarge",
+      "c7i.48xlarge",
+      "c7i.4xlarge",
+      "c7i.8xlarge",
+      "c7i.large",
+      "c7i.metal-24xl",
+      "c7i.metal-48xl",
+      "c7i.xlarge",
+      "cc1.4xlarge",
+      "cc2.8xlarge",
+      "cg1.4xlarge",
+      "cr1.8xlarge",
+      "d2.2xlarge",
+      "d2.4xlarge",
+      "d2.8xlarge",
+      "d2.xlarge",
+      "d3.2xlarge",
+      "d3.4xlarge",
+      "d3.8xlarge",
+      "d3.xlarge",
+      "d3en.12xlarge",
+      "d3en.2xlarge",
+      "d3en.4xlarge",
+      "d3en.6xlarge",
+      "d3en.8xlarge",
+      "d3en.xlarge",
+      "dl1.24xlarge",
+      "dl2q.24xlarge",
+      "f1.16xlarge",
+      "f1.2xlarge",
+      "f1.4xlarge",
+      "g2.2xlarge",
+      "g2.8xlarge",
+      "g3.16xlarge",
+      "g3.4xlarge",
+      "g3.8xlarge",
+      "g3s.xlarge",
+      "g4ad.16xlarge",
+      "g4ad.2xlarge",
+      "g4ad.4xlarge",
+      "g4ad.8xlarge",
+      "g4ad.xlarge",
+      "g4dn.12xlarge",
+      "g4dn.16xlarge",
+      "g4dn.2xlarge",
+      "g4dn.4xlarge",
+      "g4dn.8xlarge",
+      "g4dn.metal",
+      "g4dn.xlarge",
+      "g5.12xlarge",
+      "g5.16xlarge",
+      "g5.24xlarge",
+      "g5.2xlarge",
+      "g5.48xlarge",
+      "g5.4xlarge",
+      "g5.8xlarge",
+      "g5.xlarge",
+      "g5g.16xlarge",
+      "g5g.2xlarge",
+      "g5g.4xlarge",
+      "g5g.8xlarge",
+      "g5g.metal",
+      "g5g.xlarge",
+      "g6.12xlarge",
+      "g6.16xlarge",
+      "g6.24xlarge",
+      "g6.2xlarge",
+      "g6.48xlarge",
+      "g6.4xlarge",
+      "g6.8xlarge",
+      "g6.xlarge",
+      "g6e.12xlarge",
+      "g6e.16xlarge",
+      "g6e.24xlarge",
+      "g6e.2xlarge",
+      "g6e.48xlarge",
+      "g6e.4xlarge",
+      "g6e.8xlarge",
+      "g6e.xlarge",
+      "gr6.4xlarge",
+      "gr6.8xlarge",
+      "h1.16xlarge",
+      "h1.2xlarge",
+      "h1.4xlarge",
+      "h1.8xlarge",
+      "hi1.4xlarge",
+      "hpc6a.48xlarge",
+      "hpc6id.32xlarge",
+      "hpc7a.12xlarge",
+      "hpc7a.24xlarge",
+      "hpc7a.48xlarge",
+      "hpc7a.96xlarge",
+      "hpc7g.16xlarge",
+      "hpc7g.4xlarge",
+      "hpc7g.8xlarge",
+      "hs1.8xlarge",
+      "i2.2xlarge",
+      "i2.4xlarge",
+      "i2.8xlarge",
+      "i2.xlarge",
+      "i3.16xlarge",
+      "i3.2xlarge",
+      "i3.4xlarge",
+      "i3.8xlarge",
+      "i3.large",
+      "i3.metal",
+      "i3.xlarge",
+      "i3en.12xlarge",
+      "i3en.24xlarge",
+      "i3en.2xlarge",
+      "i3en.3xlarge",
+      "i3en.6xlarge",
+      "i3en.large",
+      "i3en.metal",
+      "i3en.xlarge",
+      "i4g.16xlarge",
+      "i4g.2xlarge",
+      "i4g.4xlarge",
+      "i4g.8xlarge",
+      "i4g.large",
+      "i4g.xlarge",
+      "i4i.12xlarge",
+      "i4i.16xlarge",
+      "i4i.24xlarge",
+      "i4i.2xlarge",
+      "i4i.32xlarge",
+      "i4i.4xlarge",
+      "i4i.8xlarge",
+      "i4i.large",
+      "i4i.metal",
+      "i4i.xlarge",
+      "im4gn.16xlarge",
+      "im4gn.2xlarge",
+      "im4gn.4xlarge",
+      "im4gn.8xlarge",
+      "im4gn.large",
+      "im4gn.xlarge",
+      "inf1.24xlarge",
+      "inf1.2xlarge",
+      "inf1.6xlarge",
+      "inf1.xlarge",
+      "inf2.24xlarge",
+      "inf2.48xlarge",
+      "inf2.8xlarge",
+      "inf2.xlarge",
+      "is4gen.2xlarge",
+      "is4gen.4xlarge",
+      "is4gen.8xlarge",
+      "is4gen.large",
+      "is4gen.medium",
+      "is4gen.xlarge",
+      "m1.large",
+      "m1.medium",
+      "m1.small",
+      "m1.xlarge",
+      "m2.2xlarge",
+      "m2.4xlarge",
+      "m2.xlarge",
+      "m3.2xlarge",
+      "m3.large",
+      "m3.medium",
+      "m3.xlarge",
+      "m4.10xlarge",
+      "m4.16xlarge",
+      "m4.2xlarge",
+      "m4.4xlarge",
+      "m4.large",
+      "m4.xlarge",
+      "m5.12xlarge",
+      "m5.16xlarge",
+      "m5.24xlarge",
+      "m5.2xlarge",
+      "m5.4xlarge",
+      "m5.8xlarge",
+      "m5.large",
+      "m5.metal",
+      "m5.xlarge",
+      "m5a.12xlarge",
+      "m5a.16xlarge",
+      "m5a.24xlarge",
+      "m5a.2xlarge",
+      "m5a.4xlarge",
+      "m5a.8xlarge",
+      "m5a.large",
+      "m5a.xlarge",
+      "m5ad.12xlarge",
+      "m5ad.16xlarge",
+      "m5ad.24xlarge",
+      "m5ad.2xlarge",
+      "m5ad.4xlarge",
+      "m5ad.8xlarge",
+      "m5ad.large",
+      "m5ad.xlarge",
+      "m5d.12xlarge",
+      "m5d.16xlarge",
+      "m5d.24xlarge",
+      "m5d.2xlarge",
+      "m5d.4xlarge",
+      "m5d.8xlarge",
+      "m5d.large",
+      "m5d.metal",
+      "m5d.xlarge",
+      "m5dn.12xlarge",
+      "m5dn.16xlarge",
+      "m5dn.24xlarge",
+      "m5dn.2xlarge",
+      "m5dn.4xlarge",
+      "m5dn.8xlarge",
+      "m5dn.large",
+      "m5dn.metal",
+      "m5dn.xlarge",
+      "m5n.12xlarge",
+      "m5n.16xlarge",
+      "m5n.24xlarge",
+      "m5n.2xlarge",
+      "m5n.4xlarge",
+      "m5n.8xlarge",
+      "m5n.large",
+      "m5n.metal",
+      "m5n.xlarge",
+      "m5zn.12xlarge",
+      "m5zn.2xlarge",
+      "m5zn.3xlarge",
+      "m5zn.6xlarge",
+      "m5zn.large",
+      "m5zn.metal",
+      "m5zn.xlarge",
+      "m6a.12xlarge",
+      "m6a.16xlarge",
+      "m6a.24xlarge",
+      "m6a.2xlarge",
+      "m6a.32xlarge",
+      "m6a.48xlarge",
+      "m6a.4xlarge",
+      "m6a.8xlarge",
+      "m6a.large",
+      "m6a.metal",
+      "m6a.xlarge",
+      "m6g.12xlarge",
+      "m6g.16xlarge",
+      "m6g.2xlarge",
+      "m6g.4xlarge",
+      "m6g.8xlarge",
+      "m6g.large",
+      "m6g.medium",
+      "m6g.metal",
+      "m6g.xlarge",
+      "m6gd.12xlarge",
+      "m6gd.16xlarge",
+      "m6gd.2xlarge",
+      "m6gd.4xlarge",
+      "m6gd.8xlarge",
+      "m6gd.large",
+      "m6gd.medium",
+      "m6gd.metal",
+      "m6gd.xlarge",
+      "m6i.12xlarge",
+      "m6i.16xlarge",
+      "m6i.24xlarge",
+      "m6i.2xlarge",
+      "m6i.32xlarge",
+      "m6i.4xlarge",
+      "m6i.8xlarge",
+      "m6i.large",
+      "m6i.metal",
+      "m6i.xlarge",
+      "m6id.12xlarge",
+      "m6id.16xlarge",
+      "m6id.24xlarge",
+      "m6id.2xlarge",
+      "m6id.32xlarge",
+      "m6id.4xlarge",
+      "m6id.8xlarge",
+      "m6id.large",
+      "m6id.metal",
+      "m6id.xlarge",
+      "m6idn.12xlarge",
+      "m6idn.16xlarge",
+      "m6idn.24xlarge",
+      "m6idn.2xlarge",
+      "m6idn.32xlarge",
+      "m6idn.4xlarge",
+      "m6idn.8xlarge",
+      "m6idn.large",
+      "m6idn.metal",
+      "m6idn.xlarge",
+      "m6in.12xlarge",
+      "m6in.16xlarge",
+      "m6in.24xlarge",
+      "m6in.2xlarge",
+      "m6in.32xlarge",
+      "m6in.4xlarge",
+      "m6in.8xlarge",
+      "m6in.large",
+      "m6in.metal",
+      "m6in.xlarge",
+      "m7a.12xlarge",
+      "m7a.16xlarge",
+      "m7a.24xlarge",
+      "m7a.2xlarge",
+      "m7a.32xlarge",
+      "m7a.48xlarge",
+      "m7a.4xlarge",
+      "m7a.8xlarge",
+      "m7a.large",
+      "m7a.medium",
+      "m7a.metal-48xl",
+      "m7a.xlarge",
+      "m7g.12xlarge",
+      "m7g.16xlarge",
+      "m7g.2xlarge",
+      "m7g.4xlarge",
+      "m7g.8xlarge",
+      "m7g.large",
+      "m7g.medium",
+      "m7g.metal",
+      "m7g.xlarge",
+      "m7gd.12xlarge",
+      "m7gd.16xlarge",
+      "m7gd.2xlarge",
+      "m7gd.4xlarge",
+      "m7gd.8xlarge",
+      "m7gd.large",
+      "m7gd.medium",
+      "m7gd.metal",
+      "m7gd.xlarge",
+      "m7i-flex.2xlarge",
+      "m7i-flex.4xlarge",
+      "m7i-flex.8xlarge",
+      "m7i-flex.large",
+      "m7i-flex.xlarge",
+      "m7i.12xlarge",
+      "m7i.16xlarge",
+      "m7i.24xlarge",
+      "m7i.2xlarge",
+      "m7i.48xlarge",
+      "m7i.4xlarge",
+      "m7i.8xlarge",
+      "m7i.large",
+      "m7i.metal-24xl",
+      "m7i.metal-48xl",
+      "m7i.xlarge",
+      "mac1.metal",
+      "mac2-m1ultra.metal",
+      "mac2-m2.metal",
+      "mac2-m2pro.metal",
+      "mac2.metal",
+      "p2.16xlarge",
+      "p2.8xlarge",
+      "p2.xlarge",
+      "p3.16xlarge",
+      "p3.2xlarge",
+      "p3.8xlarge",
+      "p3dn.24xlarge",
+      "p4d.24xlarge",
+      "p4de.24xlarge",
+      "p5.48xlarge",
+      "r3.2xlarge",
+      "r3.4xlarge",
+      "r3.8xlarge",
+      "r3.large",
+      "r3.xlarge",
+      "r4.16xlarge",
+      "r4.2xlarge",
+      "r4.4xlarge",
+      "r4.8xlarge",
+      "r4.large",
+      "r4.xlarge",
+      "r5.12xlarge",
+      "r5.16xlarge",
+      "r5.24xlarge",
+      "r5.2xlarge",
+      "r5.4xlarge",
+      "r5.8xlarge",
+      "r5.large",
+      "r5.metal",
+      "r5.xlarge",
+      "r5a.12xlarge",
+      "r5a.16xlarge",
+      "r5a.24xlarge",
+      "r5a.2xlarge",
+      "r5a.4xlarge",
+      "r5a.8xlarge",
+      "r5a.large",
+      "r5a.xlarge",
+      "r5ad.12xlarge",
+      "r5ad.16xlarge",
+      "r5ad.24xlarge",
+      "r5ad.2xlarge",
+      "r5ad.4xlarge",
+      "r5ad.8xlarge",
+      "r5ad.large",
+      "r5ad.xlarge",
+      "r5b.12xlarge",
+      "r5b.16xlarge",
+      "r5b.24xlarge",
+      "r5b.2xlarge",
+      "r5b.4xlarge",
+      "r5b.8xlarge",
+      "r5b.large",
+      "r5b.metal",
+      "r5b.xlarge",
+      "r5d.12xlarge",
+      "r5d.16xlarge",
+      "r5d.24xlarge",
+      "r5d.2xlarge",
+      "r5d.4xlarge",
+      "r5d.8xlarge",
+      "r5d.large",
+      "r5d.metal",
+      "r5d.xlarge",
+      "r5dn.12xlarge",
+      "r5dn.16xlarge",
+      "r5dn.24xlarge",
+      "r5dn.2xlarge",
+      "r5dn.4xlarge",
+      "r5dn.8xlarge",
+      "r5dn.large",
+      "r5dn.metal",
+      "r5dn.xlarge",
+      "r5n.12xlarge",
+      "r5n.16xlarge",
+      "r5n.24xlarge",
+      "r5n.2xlarge",
+      "r5n.4xlarge",
+      "r5n.8xlarge",
+      "r5n.large",
+      "r5n.metal",
+      "r5n.xlarge",
+      "r6a.12xlarge",
+      "r6a.16xlarge",
+      "r6a.24xlarge",
+      "r6a.2xlarge",
+      "r6a.32xlarge",
+      "r6a.48xlarge",
+      "r6a.4xlarge",
+      "r6a.8xlarge",
+      "r6a.large",
+      "r6a.metal",
+      "r6a.xlarge",
+      "r6g.12xlarge",
+      "r6g.16xlarge",
+      "r6g.2xlarge",
+      "r6g.4xlarge",
+      "r6g.8xlarge",
+      "r6g.large",
+      "r6g.medium",
+      "r6g.metal",
+      "r6g.xlarge",
+      "r6gd.12xlarge",
+      "r6gd.16xlarge",
+      "r6gd.2xlarge",
+      "r6gd.4xlarge",
+      "r6gd.8xlarge",
+      "r6gd.large",
+      "r6gd.medium",
+      "r6gd.metal",
+      "r6gd.xlarge",
+      "r6i.12xlarge",
+      "r6i.16xlarge",
+      "r6i.24xlarge",
+      "r6i.2xlarge",
+      "r6i.32xlarge",
+      "r6i.4xlarge",
+      "r6i.8xlarge",
+      "r6i.large",
+      "r6i.metal",
+      "r6i.xlarge",
+      "r6id.12xlarge",
+      "r6id.16xlarge",
+      "r6id.24xlarge",
+      "r6id.2xlarge",
+      "r6id.32xlarge",
+      "r6id.4xlarge",
+      "r6id.8xlarge",
+      "r6id.large",
+      "r6id.metal",
+      "r6id.xlarge",
+      "r6idn.12xlarge",
+      "r6idn.16xlarge",
+      "r6idn.24xlarge",
+      "r6idn.2xlarge",
+      "r6idn.32xlarge",
+      "r6idn.4xlarge",
+      "r6idn.8xlarge",
+      "r6idn.large",
+      "r6idn.metal",
+      "r6idn.xlarge",
+      "r6in.12xlarge",
+      "r6in.16xlarge",
+      "r6in.24xlarge",
+      "r6in.2xlarge",
+      "r6in.32xlarge",
+      "r6in.4xlarge",
+      "r6in.8xlarge",
+      "r6in.large",
+      "r6in.metal",
+      "r6in.xlarge",
+      "r7a.12xlarge",
+      "r7a.16xlarge",
+      "r7a.24xlarge",
+      "r7a.2xlarge",
+      "r7a.32xlarge",
+      "r7a.48xlarge",
+      "r7a.4xlarge",
+      "r7a.8xlarge",
+      "r7a.large",
+      "r7a.medium",
+      "r7a.metal-48xl",
+      "r7a.xlarge",
+      "r7g.12xlarge",
+      "r7g.16xlarge",
+      "r7g.2xlarge",
+      "r7g.4xlarge",
+      "r7g.8xlarge",
+      "r7g.large",
+      "r7g.medium",
+      "r7g.metal",
+      "r7g.xlarge",
+      "r7gd.12xlarge",
+      "r7gd.16xlarge",
+      "r7gd.2xlarge",
+      "r7gd.4xlarge",
+      "r7gd.8xlarge",
+      "r7gd.large",
+      "r7gd.medium",
+      "r7gd.metal",
+      "r7gd.xlarge",
+      "r7i.12xlarge",
+      "r7i.16xlarge",
+      "r7i.24xlarge",
+      "r7i.2xlarge",
+      "r7i.48xlarge",
+      "r7i.4xlarge",
+      "r7i.8xlarge",
+      "r7i.large",
+      "r7i.metal-24xl",
+      "r7i.metal-48xl",
+      "r7i.xlarge",
+      "r7iz.12xlarge",
+      "r7iz.16xlarge",
+      "r7iz.2xlarge",
+      "r7iz.32xlarge",
+      "r7iz.4xlarge",
+      "r7iz.8xlarge",
+      "r7iz.large",
+      "r7iz.metal-16xl",
+      "r7iz.metal-32xl",
+      "r7iz.xlarge",
+      "r8g.12xlarge",
+      "r8g.16xlarge",
+      "r8g.24xlarge",
+      "r8g.2xlarge",
+      "r8g.48xlarge",
+      "r8g.4xlarge",
+      "r8g.8xlarge",
+      "r8g.large",
+      "r8g.medium",
+      "r8g.metal-24xl",
+      "r8g.metal-48xl",
+      "r8g.xlarge",
+      "t1.micro",
+      "t2.2xlarge",
+      "t2.large",
+      "t2.medium",
+      "t2.micro",
+      "t2.nano",
+      "t2.small",
+      "t2.xlarge",
+      "t3.2xlarge",
+      "t3.large",
+      "t3.medium",
+      "t3.micro",
+      "t3.nano",
+      "t3.small",
+      "t3.xlarge",
+      "t3a.2xlarge",
+      "t3a.large",
+      "t3a.medium",
+      "t3a.micro",
+      "t3a.nano",
+      "t3a.small",
+      "t3a.xlarge",
+      "t4g.2xlarge",
+      "t4g.large",
+      "t4g.medium",
+      "t4g.micro",
+      "t4g.nano",
+      "t4g.small",
+      "t4g.xlarge",
+      "trn1.2xlarge",
+      "trn1.32xlarge",
+      "trn1n.32xlarge",
+      "u-12tb1.112xlarge",
+      "u-12tb1.metal",
+      "u-18tb1.112xlarge",
+      "u-18tb1.metal",
+      "u-24tb1.112xlarge",
+      "u-24tb1.metal",
+      "u-3tb1.56xlarge",
+      "u-6tb1.112xlarge",
+      "u-6tb1.56xlarge",
+      "u-6tb1.metal",
+      "u-9tb1.112xlarge",
+      "u-9tb1.metal",
+      "u7i-12tb.224xlarge",
+      "u7ib-12tb.224xlarge",
+      "u7in-16tb.224xlarge",
+      "u7in-24tb.224xlarge",
+      "u7in-32tb.224xlarge",
+      "vt1.24xlarge",
+      "vt1.3xlarge",
+      "vt1.6xlarge",
+      "x1.16xlarge",
+      "x1.32xlarge",
+      "x1e.16xlarge",
+      "x1e.2xlarge",
+      "x1e.32xlarge",
+      "x1e.4xlarge",
+      "x1e.8xlarge",
+      "x1e.xlarge",
+      "x2gd.12xlarge",
+      "x2gd.16xlarge",
+      "x2gd.2xlarge",
+      "x2gd.4xlarge",
+      "x2gd.8xlarge",
+      "x2gd.large",
+      "x2gd.medium",
+      "x2gd.metal",
+      "x2gd.xlarge",
+      "x2idn.16xlarge",
+      "x2idn.24xlarge",
+      "x2idn.32xlarge",
+      "x2idn.metal",
+      "x2iedn.16xlarge",
+      "x2iedn.24xlarge",
+      "x2iedn.2xlarge",
+      "x2iedn.32xlarge",
+      "x2iedn.4xlarge",
+      "x2iedn.8xlarge",
+      "x2iedn.metal",
+      "x2iedn.xlarge",
+      "x2iezn.12xlarge",
+      "x2iezn.2xlarge",
+      "x2iezn.4xlarge",
+      "x2iezn.6xlarge",
+      "x2iezn.8xlarge",
+      "x2iezn.metal",
+      "z1d.12xlarge",
+      "z1d.2xlarge",
+      "z1d.3xlarge",
+      "z1d.6xlarge",
+      "z1d.large",
+      "z1d.metal",
+      "z1d.xlarge"
+     ],
      "type": "string"
     },
     "KernelId": {
@@ -567,6 +1416,10 @@
    "additionalProperties": false,
    "properties": {
     "AutoRecovery": {
+     "enum": [
+      "default",
+      "disabled"
+     ],
      "type": "string"
     }
    },
@@ -600,18 +1453,34 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpProtocolIpv6": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     },
     "InstanceMetadataTags": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     }
    },
@@ -802,6 +1671,10 @@
      "type": "boolean"
     },
     "HostnameType": {
+     "enum": [
+      "ip-name",
+      "resource-name"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-redshift-integration.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-redshift-integration.json
index a3df6f7445..0aa07b1c20 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-redshift-integration.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-redshift-integration.json
@@ -63,6 +63,7 @@
   "IntegrationName": {
    "maxLength": 64,
    "minLength": 1,
+   "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$",
    "type": "string"
   },
   "KMSKeyId": {
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-redshift-integration.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-redshift-integration.json
index a3df6f7445..0aa07b1c20 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-redshift-integration.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-redshift-integration.json
@@ -63,6 +63,7 @@
   "IntegrationName": {
    "maxLength": 64,
    "minLength": 1,
+   "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$",
    "type": "string"
   },
   "KMSKeyId": {
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-events-connection.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssm-resourcedatasync.json
index ec87640906..c3bbb7edbe 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssm-resourcedatasync.json
@@ -56,6 +56,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "maxLength": 1024,
      "minLength": 1,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-events-connection.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-appsync-datasource.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-appsync-datasource.json
index 06c91688b2..465e8de1f5 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-appsync-datasource.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-appsync-datasource.json
@@ -9,6 +9,9 @@
    "additionalProperties": false,
    "properties": {
     "AuthorizationType": {
+     "enum": [
+      "AWS_IAM"
+     ],
      "type": "string"
     },
     "AwsIamConfig": {
@@ -181,6 +184,9 @@
      "$ref": "#/definitions/RdsHttpEndpointConfig"
     },
     "RelationalDatabaseSourceType": {
+     "enum": [
+      "RDS_HTTP_ENDPOINT"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json
index 33366dff06..944f5608ad 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-scalingpolicy.json
index 3ec51d0018..f9f928f78e 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-scalingpolicy.json
@@ -145,6 +145,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -158,6 +162,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-cluster.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-cluster.json
index 1487c6b04d..1d57e1494d 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-cluster.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-cluster.json
@@ -61,6 +61,11 @@
      "$ref": "#/definitions/ExecuteCommandLogConfiguration"
     },
     "Logging": {
+     "enum": [
+      "DEFAULT",
+      "NONE",
+      "OVERRIDE"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-topicrule.json
index d2ced3f6b6..5c05e7d241 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-iot-topicrule.json
@@ -175,6 +175,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -187,6 +191,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -223,6 +231,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -257,6 +266,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -502,6 +512,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/me_central_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/sa_east_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-networkmanager-connectattachment.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-networkmanager-connectattachment.json
index bce9f6a99a..9a9c8f582a 100644
--- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-networkmanager-connectattachment.json
+++ b/src/cfnlint/data/schemas/providers/sa_east_1/aws-networkmanager-connectattachment.json
@@ -11,6 +11,10 @@
    "additionalProperties": false,
    "properties": {
     "Protocol": {
+     "enum": [
+      "GRE",
+      "NO_ENCAP"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-acmpca-certificateauthority.json
index e3dbc21bc5..df6c5c94c4 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-acmpca-certificateauthority.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-acmpca-certificateauthority.json
@@ -51,6 +51,7 @@
      "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration"
     },
     "CustomCname": {
+     "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*",
      "type": "string"
     },
     "Enabled": {
@@ -60,9 +61,14 @@
      "type": "integer"
     },
     "S3BucketName": {
+     "pattern": "[-a-zA-Z0-9._/]+",
      "type": "string"
     },
     "S3ObjectAcl": {
+     "enum": [
+      "BUCKET_OWNER_FULL_CONTROL",
+      "PUBLIC_READ"
+     ],
      "type": "string"
     }
    },
@@ -220,6 +226,7 @@
      "type": "boolean"
     },
     "OcspCustomCname": {
+     "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-app.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-app.json
index f1811081c1..b373f2b5c4 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-app.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-app.json
@@ -19,6 +19,7 @@
     "BuildSpec": {
      "maxLength": 25000,
      "minLength": 1,
+     "pattern": "(?s).+",
      "type": "string"
     },
     "EnableAutoBranchCreation": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-branch.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-branch.json
index a9f0d8e95c..88f27c1ec4 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-branch.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-amplify-branch.json
@@ -11,6 +11,7 @@
     "StackArn": {
      "maxLength": 2048,
      "minLength": 20,
+     "pattern": "^arn:aws:cloudformation:[a-z0-9-]+:\\d{12}:stack/.+/.+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-connectorprofile.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-connectorprofile.json
index 1d4e254a36..cdd8443198 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-connectorprofile.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-connectorprofile.json
@@ -155,9 +155,11 @@
   "ConnectorOAuthRequest": {
    "properties": {
     "AuthCode": {
+     "pattern": "\\S+",
      "type": "string"
     },
     "RedirectUri": {
+     "pattern": "\\S+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-applicationautoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-applicationautoscaling-scalingpolicy.json
index e35e4457a6..6290fce5e4 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-applicationautoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-applicationautoscaling-scalingpolicy.json
@@ -34,6 +34,13 @@
      "type": "string"
     },
     "Statistic": {
+     "enum": [
+      "Average",
+      "Maximum",
+      "Minimum",
+      "SampleCount",
+      "Sum"
+     ],
      "type": "string"
     },
     "Unit": {
@@ -124,12 +131,22 @@
    "additionalProperties": false,
    "properties": {
     "AdjustmentType": {
+     "enum": [
+      "ChangeInCapacity",
+      "ExactCapacity",
+      "PercentChangeInCapacity"
+     ],
      "type": "string"
     },
     "Cooldown": {
      "type": "integer"
     },
     "MetricAggregationType": {
+     "enum": [
+      "Average",
+      "Maximum",
+      "Minimum"
+     ],
      "type": "string"
     },
     "MinAdjustmentMagnitude": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-service.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-service.json
index 73a27aa630..b5e344b11b 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-service.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-apprunner-service.json
@@ -44,6 +44,7 @@
    "additionalProperties": false,
    "properties": {
     "BuildCommand": {
+     "pattern": "[^\\x0a\\x0d]+",
      "type": "string"
     },
     "Port": {
@@ -79,6 +80,7 @@
      "type": "array"
     },
     "StartCommand": {
+     "pattern": "[^\\x0a\\x0d]+",
      "type": "string"
     }
    },
@@ -202,6 +204,7 @@
      "type": "array"
     },
     "StartCommand": {
+     "pattern": "[^\\x0a\\x0d]+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json
index 6d56953d74..1b8bbdc7c0 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json
@@ -24,6 +24,7 @@
    "additionalProperties": false,
    "properties": {
     "S3Bucket": {
+     "pattern": "^[0-9a-z\\.\\-]*(?<!\\.)$",
      "type": "string"
     },
     "S3Key": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json
index cb499f8d1e..0824435d22 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json
@@ -20,6 +20,7 @@
    "additionalProperties": false,
    "properties": {
     "S3Bucket": {
+     "pattern": "^[0-9a-z\\.\\-]*(?<!\\.)$",
      "type": "string"
     },
     "S3Key": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-directoryconfig.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-directoryconfig.json
index 69fdaf9a0f..70a7471277 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-directoryconfig.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-directoryconfig.json
@@ -8,9 +8,15 @@
    "additionalProperties": false,
    "properties": {
     "CertificateAuthorityArn": {
+     "pattern": "^arn:aws(?:\\-cn|\\-iso\\-b|\\-iso|\\-us\\-gov)?:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.\\\\-]{0,1023}$",
      "type": "string"
     },
     "Status": {
+     "enum": [
+      "DISABLED",
+      "ENABLED",
+      "ENABLED_NO_DIRECTORY_LOGIN_FALLBACK"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-datasource.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-datasource.json
index 991b9bff48..cbf3e1ce7c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-datasource.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-datasource.json
@@ -9,6 +9,9 @@
    "additionalProperties": false,
    "properties": {
     "AuthorizationType": {
+     "enum": [
+      "AWS_IAM"
+     ],
      "type": "string"
     },
     "AwsIamConfig": {
@@ -181,6 +184,9 @@
      "$ref": "#/definitions/RdsHttpEndpointConfig"
     },
     "RelationalDatabaseSourceType": {
+     "enum": [
+      "RDS_HTTP_ENDPOINT"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-functionconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-functionconfiguration.json
index 31766b0a77..a9bf9fec49 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-functionconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-functionconfiguration.json
@@ -8,6 +8,9 @@
    "additionalProperties": false,
    "properties": {
     "Name": {
+     "enum": [
+      "APPSYNC_JS"
+     ],
      "type": "string"
     },
     "RuntimeVersion": {
@@ -33,9 +36,19 @@
    "additionalProperties": false,
    "properties": {
     "ConflictDetection": {
+     "enum": [
+      "NONE",
+      "VERSION"
+     ],
      "type": "string"
     },
     "ConflictHandler": {
+     "enum": [
+      "AUTOMERGE",
+      "LAMBDA",
+      "NONE",
+      "OPTIMISTIC_CONCURRENCY"
+     ],
      "type": "string"
     },
     "LambdaConflictHandlerConfig": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-resolver.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-resolver.json
index 144958cfd2..63efa8ac4d 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-resolver.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-resolver.json
@@ -10,6 +10,9 @@
    "additionalProperties": false,
    "properties": {
     "Name": {
+     "enum": [
+      "APPSYNC_JS"
+     ],
      "type": "string"
     },
     "RuntimeVersion": {
@@ -69,9 +72,19 @@
    "additionalProperties": false,
    "properties": {
     "ConflictDetection": {
+     "enum": [
+      "NONE",
+      "VERSION"
+     ],
      "type": "string"
     },
     "ConflictHandler": {
+     "enum": [
+      "AUTOMERGE",
+      "LAMBDA",
+      "NONE",
+      "OPTIMISTIC_CONCURRENCY"
+     ],
      "type": "string"
     },
     "LambdaConflictHandlerConfig": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json
index b7218ab5f8..948b2de281 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json
@@ -187,6 +187,7 @@
    "type": "string"
   },
   "S3Url": {
+   "pattern": "^(S|s)3:\\/\\/[a-zA-Z0-9\\-\\.\\(\\)\\'\\*\\_\\!\\/]+$",
    "type": "string"
   },
   "Scope": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json
index fc906014bf..f0ce4054cc 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-autoscalinggroup.json
@@ -259,6 +259,7 @@
      "type": "string"
     },
     "LaunchTemplateName": {
+     "pattern": "[a-zA-Z0-9\\(\\)\\.\\-/_]+",
      "type": "string"
     },
     "Version": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json
index 9ae289b51e..b0b305b391 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-scalingpolicy.json
index 0c54f11eb5..84ad08d97f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-scalingpolicy.json
@@ -154,6 +154,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -168,6 +172,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-backup-backupselection.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-backup-backupselection.json
index 96d5245c4c..232c450e0d 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-backup-backupselection.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-backup-backupselection.json
@@ -74,6 +74,7 @@
      "uniqueItems": false
     },
     "SelectionName": {
+     "pattern": "^[a-zA-Z0-9\\-\\_\\.]{1,50}$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json
index 69abdd1e01..a1275eb05f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-batch-computeenvironment.json
@@ -32,6 +32,12 @@
    "additionalProperties": false,
    "properties": {
     "AllocationStrategy": {
+     "enum": [
+      "BEST_FIT",
+      "BEST_FIT_PROGRESSIVE",
+      "SPOT_CAPACITY_OPTIMIZED",
+      "SPOT_PRICE_CAPACITY_OPTIMIZED"
+     ],
      "type": "string"
     },
     "BidPercentage": {
@@ -109,6 +115,12 @@
      "type": "object"
     },
     "Type": {
+     "enum": [
+      "EC2",
+      "FARGATE",
+      "FARGATE_SPOT",
+      "SPOT"
+     ],
      "type": "string"
     },
     "UpdateToLatestImageVersion": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-budgets-budgetsaction.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-budgets-budgetsaction.json
index 885a500947..00f0445fb6 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-budgets-budgetsaction.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-budgets-budgetsaction.json
@@ -52,6 +52,7 @@
      "type": "array"
     },
     "PolicyArn": {
+     "pattern": "^arn:aws(-cn|-us-gov|-iso|-iso-[a-z]{1})?:iam::(\\d{12}|aws):policy(\\u002F[\\u0021-\\u007F]+\\u002F|\\u002F)[\\w+=,.@-]+$",
      "type": "string"
     },
     "Roles": {
@@ -96,6 +97,7 @@
    "additionalProperties": false,
    "properties": {
     "PolicyId": {
+     "pattern": "^p-[0-9a-zA-Z_]{8,128}$",
      "type": "string"
     },
     "TargetIds": {
@@ -125,6 +127,7 @@
      "type": "array"
     },
     "Region": {
+     "pattern": "^\\w{2}-\\w+(-\\w+)?-\\d$",
      "type": "string"
     },
     "Subtype": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idmappingtable.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idmappingtable.json
index ea68911580..72c21441c2 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idmappingtable.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idmappingtable.json
@@ -12,6 +12,7 @@
     "InputReferenceArn": {
      "maxLength": 2048,
      "minLength": 20,
+     "pattern": "arn:(aws|aws-us-gov|aws-cn):entityresolution:.*:[0-9]+:(idmappingworkflow/.*)",
      "type": "string"
     },
     "ManageResourcePolicies": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idnamespaceassociation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idnamespaceassociation.json
index 790b5213c1..9a6d4b7f2a 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idnamespaceassociation.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-idnamespaceassociation.json
@@ -29,6 +29,7 @@
    "properties": {
     "InputReferenceArn": {
      "maxLength": 256,
+     "pattern": "arn:aws:entityresolution:[\\w]{2}-[\\w]{4,9}-[\\d]:[\\d]{12}:idnamespace/[\\d\\w-]+",
      "type": "string"
     },
     "ManageResourcePolicies": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-membership.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-membership.json
index da1ef65560..e627882df7 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-membership.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cleanrooms-membership.json
@@ -37,6 +37,7 @@
     "RoleArn": {
      "maxLength": 512,
      "minLength": 32,
+     "pattern": "arn:aws:iam::[\\w]+:role/[\\w+=./@-]+",
      "type": "string"
     }
    },
@@ -78,9 +79,11 @@
     "Bucket": {
      "maxLength": 63,
      "minLength": 3,
+     "pattern": ".*(?!^(\\d+\\.)+\\d+$)(^(([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])\\.)*([a-z0-9]|[a-z0-9][a-z0-9\\-]*[a-z0-9])$).*",
      "type": "string"
     },
     "KeyPrefix": {
+     "pattern": "[\\w!.=*/-]*",
      "type": "string"
     },
     "ResultFormat": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-hookversion.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-hookversion.json
index fd51682ba6..ade7b162c0 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-hookversion.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-hookversion.json
@@ -19,6 +19,7 @@
     "LogRoleArn": {
      "maxLength": 256,
      "minLength": 1,
+     "pattern": "arn:.+:iam::[0-9]{12}:role/.+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-resourceversion.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-resourceversion.json
index 9b5a04ac7d..320e8edf6b 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-resourceversion.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudformation-resourceversion.json
@@ -19,6 +19,7 @@
     "LogRoleArn": {
      "maxLength": 256,
      "minLength": 1,
+     "pattern": "arn:.+:iam::[0-9]{12}:role/.+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-distribution.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-distribution.json
index 9a919e6cc4..066d90ae55 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-distribution.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-distribution.json
@@ -119,6 +119,11 @@
    "additionalProperties": false,
    "properties": {
     "Forward": {
+     "enum": [
+      "all",
+      "none",
+      "whitelist"
+     ],
      "type": "string"
     },
     "WhitelistedNames": {
@@ -333,6 +338,11 @@
      "uniqueItems": false
     },
     "ViewerProtocolPolicy": {
+     "enum": [
+      "allow-all",
+      "https-only",
+      "redirect-to-https"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-function.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-function.json
index eb3d7de521..738b4f3204 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-function.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-function.json
@@ -15,6 +15,10 @@
      "uniqueItems": true
     },
     "Runtime": {
+     "enum": [
+      "cloudfront-js-1.0",
+      "cloudfront-js-2.0"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-keyvaluestore.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-keyvaluestore.json
index b03707f64e..3d0b7e4e33 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-keyvaluestore.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-keyvaluestore.json
@@ -11,6 +11,9 @@
      "type": "string"
     },
     "SourceType": {
+     "enum": [
+      "S3"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-codedeploy-deploymentconfig.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-codedeploy-deploymentconfig.json
index a3a68ac63b..711af1ad5f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-codedeploy-deploymentconfig.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-codedeploy-deploymentconfig.json
@@ -32,6 +32,10 @@
    "additionalProperties": false,
    "properties": {
     "Type": {
+     "enum": [
+      "FLEET_PERCENT",
+      "HOST_COUNT"
+     ],
      "type": "string"
     },
     "Value": {
@@ -86,6 +90,11 @@
      "$ref": "#/definitions/TimeBasedLinear"
     },
     "Type": {
+     "enum": [
+      "AllAtOnce",
+      "TimeBasedCanary",
+      "TimeBasedLinear"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json
index 12f8fb7e01..6eb926b2b7 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-flywheel.json
@@ -86,6 +86,7 @@
   "KmsKeyId": {
    "maxLength": 2048,
    "minLength": 1,
+   "pattern": "^\\p{ASCII}+$",
    "type": "string"
   },
   "Tag": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-config-conformancepack.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-config-conformancepack.json
index 14f1ad94ea..92d3b0e897 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-config-conformancepack.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-config-conformancepack.json
@@ -77,11 +77,13 @@
     "DocumentName": {
      "maxLength": 128,
      "minLength": 3,
+     "pattern": "^[a-zA-Z0-9_\\-.:/]{3,200}$",
      "type": "string"
     },
     "DocumentVersion": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "([$]LATEST|[$]DEFAULT|^[1-9][0-9]*$)",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-connect-user.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-connect-user.json
index f4f9685416..363f256872 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-connect-user.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-connect-user.json
@@ -19,6 +19,7 @@
    "type": "boolean"
   },
   "DeskPhoneNumber": {
+   "pattern": "\\\\+[1-9]\\\\d{1,14}$",
    "type": "string"
   },
   "Email": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-databrew-job.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-databrew-job.json
index c514e27dce..e87e06767c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-databrew-job.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-databrew-job.json
@@ -258,6 +258,7 @@
     "BucketOwner": {
      "maxLength": 12,
      "minLength": 12,
+     "pattern": "^[0-9]{12}$",
      "type": "string"
     },
     "Key": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json
index 209a3e69b4..9e8b6c5929 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json
@@ -300,6 +300,72 @@
    "type": "object"
   },
   "Timezone": {
+   "enum": [
+    "AFRICA_JOHANNESBURG",
+    "AMERICA_MONTREAL",
+    "AMERICA_SAO_PAULO",
+    "ASIA_BAHRAIN",
+    "ASIA_BANGKOK",
+    "ASIA_CALCUTTA",
+    "ASIA_DUBAI",
+    "ASIA_HONG_KONG",
+    "ASIA_JAKARTA",
+    "ASIA_KUALA_LUMPUR",
+    "ASIA_SEOUL",
+    "ASIA_SHANGHAI",
+    "ASIA_SINGAPORE",
+    "ASIA_TAIPEI",
+    "ASIA_TOKYO",
+    "AUSTRALIA_MELBOURNE",
+    "AUSTRALIA_SYDNEY",
+    "CANADA_CENTRAL",
+    "CET",
+    "CST6CDT",
+    "ETC_GMT",
+    "ETC_GMT0",
+    "ETC_GMT_ADD_0",
+    "ETC_GMT_ADD_1",
+    "ETC_GMT_ADD_10",
+    "ETC_GMT_ADD_11",
+    "ETC_GMT_ADD_12",
+    "ETC_GMT_ADD_2",
+    "ETC_GMT_ADD_3",
+    "ETC_GMT_ADD_4",
+    "ETC_GMT_ADD_5",
+    "ETC_GMT_ADD_6",
+    "ETC_GMT_ADD_7",
+    "ETC_GMT_ADD_8",
+    "ETC_GMT_ADD_9",
+    "ETC_GMT_NEG_0",
+    "ETC_GMT_NEG_1",
+    "ETC_GMT_NEG_10",
+    "ETC_GMT_NEG_11",
+    "ETC_GMT_NEG_12",
+    "ETC_GMT_NEG_13",
+    "ETC_GMT_NEG_14",
+    "ETC_GMT_NEG_2",
+    "ETC_GMT_NEG_3",
+    "ETC_GMT_NEG_4",
+    "ETC_GMT_NEG_5",
+    "ETC_GMT_NEG_6",
+    "ETC_GMT_NEG_7",
+    "ETC_GMT_NEG_8",
+    "ETC_GMT_NEG_9",
+    "EUROPE_DUBLIN",
+    "EUROPE_LONDON",
+    "EUROPE_PARIS",
+    "EUROPE_STOCKHOLM",
+    "EUROPE_ZURICH",
+    "ISRAEL",
+    "MEXICO_GENERAL",
+    "MST7MDT",
+    "PACIFIC_AUCKLAND",
+    "US_CENTRAL",
+    "US_EASTERN",
+    "US_MOUNTAIN",
+    "US_PACIFIC",
+    "UTC"
+   ],
    "type": "string"
   },
   "TypeRevision": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-deadline-queue.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-deadline-queue.json
index 530bddebb8..c735dda205 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-deadline-queue.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-deadline-queue.json
@@ -19,6 +19,7 @@
     "RootPrefix": {
      "maxLength": 63,
      "minLength": 1,
+     "pattern": "[a-zA-Z0-9-_/]+",
      "type": "string"
     },
     "S3BucketName": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-dynamodb-globaltable.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-dynamodb-globaltable.json
index e241a8ad94..90ee566fc0 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-dynamodb-globaltable.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-dynamodb-globaltable.json
@@ -437,6 +437,12 @@
    "additionalProperties": false,
    "properties": {
     "StreamViewType": {
+     "enum": [
+      "KEYS_ONLY",
+      "NEW_AND_OLD_IMAGES",
+      "NEW_IMAGE",
+      "OLD_IMAGE"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ipampool.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ipampool.json
index e978a97b05..34ce39501a 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ipampool.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-ipampool.json
@@ -39,6 +39,9 @@
      "type": "string"
     },
     "ResourceType": {
+     "enum": [
+      "vpc"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json
index b0b2276741..c34027b1b2 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-launchtemplate.json
@@ -68,6 +68,10 @@
    "additionalProperties": false,
    "properties": {
     "CapacityReservationPreference": {
+     "enum": [
+      "none",
+      "open"
+     ],
      "type": "string"
     },
     "CapacityReservationTarget": {
@@ -284,12 +288,22 @@
      "uniqueItems": false
     },
     "BareMetal": {
+     "enum": [
+      "excluded",
+      "included",
+      "required"
+     ],
      "type": "string"
     },
     "BaselineEbsBandwidthMbps": {
      "$ref": "#/definitions/BaselineEbsBandwidthMbps"
     },
     "BurstablePerformance": {
+     "enum": [
+      "excluded",
+      "included",
+      "required"
+     ],
      "type": "string"
     },
     "CpuManufacturers": {
@@ -314,6 +328,11 @@
      "uniqueItems": false
     },
     "LocalStorage": {
+     "enum": [
+      "excluded",
+      "included",
+      "required"
+     ],
      "type": "string"
     },
     "LocalStorageTypes": {
@@ -452,6 +471,836 @@
      "$ref": "#/definitions/InstanceRequirements"
     },
     "InstanceType": {
+     "enum": [
+      "a1.2xlarge",
+      "a1.4xlarge",
+      "a1.large",
+      "a1.medium",
+      "a1.metal",
+      "a1.xlarge",
+      "c1.medium",
+      "c1.xlarge",
+      "c3.2xlarge",
+      "c3.4xlarge",
+      "c3.8xlarge",
+      "c3.large",
+      "c3.xlarge",
+      "c4.2xlarge",
+      "c4.4xlarge",
+      "c4.8xlarge",
+      "c4.large",
+      "c4.xlarge",
+      "c5.12xlarge",
+      "c5.18xlarge",
+      "c5.24xlarge",
+      "c5.2xlarge",
+      "c5.4xlarge",
+      "c5.9xlarge",
+      "c5.large",
+      "c5.metal",
+      "c5.xlarge",
+      "c5a.12xlarge",
+      "c5a.16xlarge",
+      "c5a.24xlarge",
+      "c5a.2xlarge",
+      "c5a.4xlarge",
+      "c5a.8xlarge",
+      "c5a.large",
+      "c5a.xlarge",
+      "c5ad.12xlarge",
+      "c5ad.16xlarge",
+      "c5ad.24xlarge",
+      "c5ad.2xlarge",
+      "c5ad.4xlarge",
+      "c5ad.8xlarge",
+      "c5ad.large",
+      "c5ad.xlarge",
+      "c5d.12xlarge",
+      "c5d.18xlarge",
+      "c5d.24xlarge",
+      "c5d.2xlarge",
+      "c5d.4xlarge",
+      "c5d.9xlarge",
+      "c5d.large",
+      "c5d.metal",
+      "c5d.xlarge",
+      "c5n.18xlarge",
+      "c5n.2xlarge",
+      "c5n.4xlarge",
+      "c5n.9xlarge",
+      "c5n.large",
+      "c5n.metal",
+      "c5n.xlarge",
+      "c6a.12xlarge",
+      "c6a.16xlarge",
+      "c6a.24xlarge",
+      "c6a.2xlarge",
+      "c6a.32xlarge",
+      "c6a.48xlarge",
+      "c6a.4xlarge",
+      "c6a.8xlarge",
+      "c6a.large",
+      "c6a.metal",
+      "c6a.xlarge",
+      "c6g.12xlarge",
+      "c6g.16xlarge",
+      "c6g.2xlarge",
+      "c6g.4xlarge",
+      "c6g.8xlarge",
+      "c6g.large",
+      "c6g.medium",
+      "c6g.metal",
+      "c6g.xlarge",
+      "c6gd.12xlarge",
+      "c6gd.16xlarge",
+      "c6gd.2xlarge",
+      "c6gd.4xlarge",
+      "c6gd.8xlarge",
+      "c6gd.large",
+      "c6gd.medium",
+      "c6gd.metal",
+      "c6gd.xlarge",
+      "c6gn.12xlarge",
+      "c6gn.16xlarge",
+      "c6gn.2xlarge",
+      "c6gn.4xlarge",
+      "c6gn.8xlarge",
+      "c6gn.large",
+      "c6gn.medium",
+      "c6gn.xlarge",
+      "c6i.12xlarge",
+      "c6i.16xlarge",
+      "c6i.24xlarge",
+      "c6i.2xlarge",
+      "c6i.32xlarge",
+      "c6i.4xlarge",
+      "c6i.8xlarge",
+      "c6i.large",
+      "c6i.metal",
+      "c6i.xlarge",
+      "c6id.12xlarge",
+      "c6id.16xlarge",
+      "c6id.24xlarge",
+      "c6id.2xlarge",
+      "c6id.32xlarge",
+      "c6id.4xlarge",
+      "c6id.8xlarge",
+      "c6id.large",
+      "c6id.metal",
+      "c6id.xlarge",
+      "c6in.12xlarge",
+      "c6in.16xlarge",
+      "c6in.24xlarge",
+      "c6in.2xlarge",
+      "c6in.32xlarge",
+      "c6in.4xlarge",
+      "c6in.8xlarge",
+      "c6in.large",
+      "c6in.metal",
+      "c6in.xlarge",
+      "c7a.12xlarge",
+      "c7a.16xlarge",
+      "c7a.24xlarge",
+      "c7a.2xlarge",
+      "c7a.32xlarge",
+      "c7a.48xlarge",
+      "c7a.4xlarge",
+      "c7a.8xlarge",
+      "c7a.large",
+      "c7a.medium",
+      "c7a.metal-48xl",
+      "c7a.xlarge",
+      "c7g.12xlarge",
+      "c7g.16xlarge",
+      "c7g.2xlarge",
+      "c7g.4xlarge",
+      "c7g.8xlarge",
+      "c7g.large",
+      "c7g.medium",
+      "c7g.metal",
+      "c7g.xlarge",
+      "c7gd.12xlarge",
+      "c7gd.16xlarge",
+      "c7gd.2xlarge",
+      "c7gd.4xlarge",
+      "c7gd.8xlarge",
+      "c7gd.large",
+      "c7gd.medium",
+      "c7gd.metal",
+      "c7gd.xlarge",
+      "c7gn.12xlarge",
+      "c7gn.16xlarge",
+      "c7gn.2xlarge",
+      "c7gn.4xlarge",
+      "c7gn.8xlarge",
+      "c7gn.large",
+      "c7gn.medium",
+      "c7gn.metal",
+      "c7gn.xlarge",
+      "c7i-flex.2xlarge",
+      "c7i-flex.4xlarge",
+      "c7i-flex.8xlarge",
+      "c7i-flex.large",
+      "c7i-flex.xlarge",
+      "c7i.12xlarge",
+      "c7i.16xlarge",
+      "c7i.24xlarge",
+      "c7i.2xlarge",
+      "c7i.48xlarge",
+      "c7i.4xlarge",
+      "c7i.8xlarge",
+      "c7i.large",
+      "c7i.metal-24xl",
+      "c7i.metal-48xl",
+      "c7i.xlarge",
+      "cc1.4xlarge",
+      "cc2.8xlarge",
+      "cg1.4xlarge",
+      "cr1.8xlarge",
+      "d2.2xlarge",
+      "d2.4xlarge",
+      "d2.8xlarge",
+      "d2.xlarge",
+      "d3.2xlarge",
+      "d3.4xlarge",
+      "d3.8xlarge",
+      "d3.xlarge",
+      "d3en.12xlarge",
+      "d3en.2xlarge",
+      "d3en.4xlarge",
+      "d3en.6xlarge",
+      "d3en.8xlarge",
+      "d3en.xlarge",
+      "dl1.24xlarge",
+      "dl2q.24xlarge",
+      "f1.16xlarge",
+      "f1.2xlarge",
+      "f1.4xlarge",
+      "g2.2xlarge",
+      "g2.8xlarge",
+      "g3.16xlarge",
+      "g3.4xlarge",
+      "g3.8xlarge",
+      "g3s.xlarge",
+      "g4ad.16xlarge",
+      "g4ad.2xlarge",
+      "g4ad.4xlarge",
+      "g4ad.8xlarge",
+      "g4ad.xlarge",
+      "g4dn.12xlarge",
+      "g4dn.16xlarge",
+      "g4dn.2xlarge",
+      "g4dn.4xlarge",
+      "g4dn.8xlarge",
+      "g4dn.metal",
+      "g4dn.xlarge",
+      "g5.12xlarge",
+      "g5.16xlarge",
+      "g5.24xlarge",
+      "g5.2xlarge",
+      "g5.48xlarge",
+      "g5.4xlarge",
+      "g5.8xlarge",
+      "g5.xlarge",
+      "g5g.16xlarge",
+      "g5g.2xlarge",
+      "g5g.4xlarge",
+      "g5g.8xlarge",
+      "g5g.metal",
+      "g5g.xlarge",
+      "g6.12xlarge",
+      "g6.16xlarge",
+      "g6.24xlarge",
+      "g6.2xlarge",
+      "g6.48xlarge",
+      "g6.4xlarge",
+      "g6.8xlarge",
+      "g6.xlarge",
+      "g6e.12xlarge",
+      "g6e.16xlarge",
+      "g6e.24xlarge",
+      "g6e.2xlarge",
+      "g6e.48xlarge",
+      "g6e.4xlarge",
+      "g6e.8xlarge",
+      "g6e.xlarge",
+      "gr6.4xlarge",
+      "gr6.8xlarge",
+      "h1.16xlarge",
+      "h1.2xlarge",
+      "h1.4xlarge",
+      "h1.8xlarge",
+      "hi1.4xlarge",
+      "hpc6a.48xlarge",
+      "hpc6id.32xlarge",
+      "hpc7a.12xlarge",
+      "hpc7a.24xlarge",
+      "hpc7a.48xlarge",
+      "hpc7a.96xlarge",
+      "hpc7g.16xlarge",
+      "hpc7g.4xlarge",
+      "hpc7g.8xlarge",
+      "hs1.8xlarge",
+      "i2.2xlarge",
+      "i2.4xlarge",
+      "i2.8xlarge",
+      "i2.xlarge",
+      "i3.16xlarge",
+      "i3.2xlarge",
+      "i3.4xlarge",
+      "i3.8xlarge",
+      "i3.large",
+      "i3.metal",
+      "i3.xlarge",
+      "i3en.12xlarge",
+      "i3en.24xlarge",
+      "i3en.2xlarge",
+      "i3en.3xlarge",
+      "i3en.6xlarge",
+      "i3en.large",
+      "i3en.metal",
+      "i3en.xlarge",
+      "i4g.16xlarge",
+      "i4g.2xlarge",
+      "i4g.4xlarge",
+      "i4g.8xlarge",
+      "i4g.large",
+      "i4g.xlarge",
+      "i4i.12xlarge",
+      "i4i.16xlarge",
+      "i4i.24xlarge",
+      "i4i.2xlarge",
+      "i4i.32xlarge",
+      "i4i.4xlarge",
+      "i4i.8xlarge",
+      "i4i.large",
+      "i4i.metal",
+      "i4i.xlarge",
+      "im4gn.16xlarge",
+      "im4gn.2xlarge",
+      "im4gn.4xlarge",
+      "im4gn.8xlarge",
+      "im4gn.large",
+      "im4gn.xlarge",
+      "inf1.24xlarge",
+      "inf1.2xlarge",
+      "inf1.6xlarge",
+      "inf1.xlarge",
+      "inf2.24xlarge",
+      "inf2.48xlarge",
+      "inf2.8xlarge",
+      "inf2.xlarge",
+      "is4gen.2xlarge",
+      "is4gen.4xlarge",
+      "is4gen.8xlarge",
+      "is4gen.large",
+      "is4gen.medium",
+      "is4gen.xlarge",
+      "m1.large",
+      "m1.medium",
+      "m1.small",
+      "m1.xlarge",
+      "m2.2xlarge",
+      "m2.4xlarge",
+      "m2.xlarge",
+      "m3.2xlarge",
+      "m3.large",
+      "m3.medium",
+      "m3.xlarge",
+      "m4.10xlarge",
+      "m4.16xlarge",
+      "m4.2xlarge",
+      "m4.4xlarge",
+      "m4.large",
+      "m4.xlarge",
+      "m5.12xlarge",
+      "m5.16xlarge",
+      "m5.24xlarge",
+      "m5.2xlarge",
+      "m5.4xlarge",
+      "m5.8xlarge",
+      "m5.large",
+      "m5.metal",
+      "m5.xlarge",
+      "m5a.12xlarge",
+      "m5a.16xlarge",
+      "m5a.24xlarge",
+      "m5a.2xlarge",
+      "m5a.4xlarge",
+      "m5a.8xlarge",
+      "m5a.large",
+      "m5a.xlarge",
+      "m5ad.12xlarge",
+      "m5ad.16xlarge",
+      "m5ad.24xlarge",
+      "m5ad.2xlarge",
+      "m5ad.4xlarge",
+      "m5ad.8xlarge",
+      "m5ad.large",
+      "m5ad.xlarge",
+      "m5d.12xlarge",
+      "m5d.16xlarge",
+      "m5d.24xlarge",
+      "m5d.2xlarge",
+      "m5d.4xlarge",
+      "m5d.8xlarge",
+      "m5d.large",
+      "m5d.metal",
+      "m5d.xlarge",
+      "m5dn.12xlarge",
+      "m5dn.16xlarge",
+      "m5dn.24xlarge",
+      "m5dn.2xlarge",
+      "m5dn.4xlarge",
+      "m5dn.8xlarge",
+      "m5dn.large",
+      "m5dn.metal",
+      "m5dn.xlarge",
+      "m5n.12xlarge",
+      "m5n.16xlarge",
+      "m5n.24xlarge",
+      "m5n.2xlarge",
+      "m5n.4xlarge",
+      "m5n.8xlarge",
+      "m5n.large",
+      "m5n.metal",
+      "m5n.xlarge",
+      "m5zn.12xlarge",
+      "m5zn.2xlarge",
+      "m5zn.3xlarge",
+      "m5zn.6xlarge",
+      "m5zn.large",
+      "m5zn.metal",
+      "m5zn.xlarge",
+      "m6a.12xlarge",
+      "m6a.16xlarge",
+      "m6a.24xlarge",
+      "m6a.2xlarge",
+      "m6a.32xlarge",
+      "m6a.48xlarge",
+      "m6a.4xlarge",
+      "m6a.8xlarge",
+      "m6a.large",
+      "m6a.metal",
+      "m6a.xlarge",
+      "m6g.12xlarge",
+      "m6g.16xlarge",
+      "m6g.2xlarge",
+      "m6g.4xlarge",
+      "m6g.8xlarge",
+      "m6g.large",
+      "m6g.medium",
+      "m6g.metal",
+      "m6g.xlarge",
+      "m6gd.12xlarge",
+      "m6gd.16xlarge",
+      "m6gd.2xlarge",
+      "m6gd.4xlarge",
+      "m6gd.8xlarge",
+      "m6gd.large",
+      "m6gd.medium",
+      "m6gd.metal",
+      "m6gd.xlarge",
+      "m6i.12xlarge",
+      "m6i.16xlarge",
+      "m6i.24xlarge",
+      "m6i.2xlarge",
+      "m6i.32xlarge",
+      "m6i.4xlarge",
+      "m6i.8xlarge",
+      "m6i.large",
+      "m6i.metal",
+      "m6i.xlarge",
+      "m6id.12xlarge",
+      "m6id.16xlarge",
+      "m6id.24xlarge",
+      "m6id.2xlarge",
+      "m6id.32xlarge",
+      "m6id.4xlarge",
+      "m6id.8xlarge",
+      "m6id.large",
+      "m6id.metal",
+      "m6id.xlarge",
+      "m6idn.12xlarge",
+      "m6idn.16xlarge",
+      "m6idn.24xlarge",
+      "m6idn.2xlarge",
+      "m6idn.32xlarge",
+      "m6idn.4xlarge",
+      "m6idn.8xlarge",
+      "m6idn.large",
+      "m6idn.metal",
+      "m6idn.xlarge",
+      "m6in.12xlarge",
+      "m6in.16xlarge",
+      "m6in.24xlarge",
+      "m6in.2xlarge",
+      "m6in.32xlarge",
+      "m6in.4xlarge",
+      "m6in.8xlarge",
+      "m6in.large",
+      "m6in.metal",
+      "m6in.xlarge",
+      "m7a.12xlarge",
+      "m7a.16xlarge",
+      "m7a.24xlarge",
+      "m7a.2xlarge",
+      "m7a.32xlarge",
+      "m7a.48xlarge",
+      "m7a.4xlarge",
+      "m7a.8xlarge",
+      "m7a.large",
+      "m7a.medium",
+      "m7a.metal-48xl",
+      "m7a.xlarge",
+      "m7g.12xlarge",
+      "m7g.16xlarge",
+      "m7g.2xlarge",
+      "m7g.4xlarge",
+      "m7g.8xlarge",
+      "m7g.large",
+      "m7g.medium",
+      "m7g.metal",
+      "m7g.xlarge",
+      "m7gd.12xlarge",
+      "m7gd.16xlarge",
+      "m7gd.2xlarge",
+      "m7gd.4xlarge",
+      "m7gd.8xlarge",
+      "m7gd.large",
+      "m7gd.medium",
+      "m7gd.metal",
+      "m7gd.xlarge",
+      "m7i-flex.2xlarge",
+      "m7i-flex.4xlarge",
+      "m7i-flex.8xlarge",
+      "m7i-flex.large",
+      "m7i-flex.xlarge",
+      "m7i.12xlarge",
+      "m7i.16xlarge",
+      "m7i.24xlarge",
+      "m7i.2xlarge",
+      "m7i.48xlarge",
+      "m7i.4xlarge",
+      "m7i.8xlarge",
+      "m7i.large",
+      "m7i.metal-24xl",
+      "m7i.metal-48xl",
+      "m7i.xlarge",
+      "mac1.metal",
+      "mac2-m1ultra.metal",
+      "mac2-m2.metal",
+      "mac2-m2pro.metal",
+      "mac2.metal",
+      "p2.16xlarge",
+      "p2.8xlarge",
+      "p2.xlarge",
+      "p3.16xlarge",
+      "p3.2xlarge",
+      "p3.8xlarge",
+      "p3dn.24xlarge",
+      "p4d.24xlarge",
+      "p4de.24xlarge",
+      "p5.48xlarge",
+      "r3.2xlarge",
+      "r3.4xlarge",
+      "r3.8xlarge",
+      "r3.large",
+      "r3.xlarge",
+      "r4.16xlarge",
+      "r4.2xlarge",
+      "r4.4xlarge",
+      "r4.8xlarge",
+      "r4.large",
+      "r4.xlarge",
+      "r5.12xlarge",
+      "r5.16xlarge",
+      "r5.24xlarge",
+      "r5.2xlarge",
+      "r5.4xlarge",
+      "r5.8xlarge",
+      "r5.large",
+      "r5.metal",
+      "r5.xlarge",
+      "r5a.12xlarge",
+      "r5a.16xlarge",
+      "r5a.24xlarge",
+      "r5a.2xlarge",
+      "r5a.4xlarge",
+      "r5a.8xlarge",
+      "r5a.large",
+      "r5a.xlarge",
+      "r5ad.12xlarge",
+      "r5ad.16xlarge",
+      "r5ad.24xlarge",
+      "r5ad.2xlarge",
+      "r5ad.4xlarge",
+      "r5ad.8xlarge",
+      "r5ad.large",
+      "r5ad.xlarge",
+      "r5b.12xlarge",
+      "r5b.16xlarge",
+      "r5b.24xlarge",
+      "r5b.2xlarge",
+      "r5b.4xlarge",
+      "r5b.8xlarge",
+      "r5b.large",
+      "r5b.metal",
+      "r5b.xlarge",
+      "r5d.12xlarge",
+      "r5d.16xlarge",
+      "r5d.24xlarge",
+      "r5d.2xlarge",
+      "r5d.4xlarge",
+      "r5d.8xlarge",
+      "r5d.large",
+      "r5d.metal",
+      "r5d.xlarge",
+      "r5dn.12xlarge",
+      "r5dn.16xlarge",
+      "r5dn.24xlarge",
+      "r5dn.2xlarge",
+      "r5dn.4xlarge",
+      "r5dn.8xlarge",
+      "r5dn.large",
+      "r5dn.metal",
+      "r5dn.xlarge",
+      "r5n.12xlarge",
+      "r5n.16xlarge",
+      "r5n.24xlarge",
+      "r5n.2xlarge",
+      "r5n.4xlarge",
+      "r5n.8xlarge",
+      "r5n.large",
+      "r5n.metal",
+      "r5n.xlarge",
+      "r6a.12xlarge",
+      "r6a.16xlarge",
+      "r6a.24xlarge",
+      "r6a.2xlarge",
+      "r6a.32xlarge",
+      "r6a.48xlarge",
+      "r6a.4xlarge",
+      "r6a.8xlarge",
+      "r6a.large",
+      "r6a.metal",
+      "r6a.xlarge",
+      "r6g.12xlarge",
+      "r6g.16xlarge",
+      "r6g.2xlarge",
+      "r6g.4xlarge",
+      "r6g.8xlarge",
+      "r6g.large",
+      "r6g.medium",
+      "r6g.metal",
+      "r6g.xlarge",
+      "r6gd.12xlarge",
+      "r6gd.16xlarge",
+      "r6gd.2xlarge",
+      "r6gd.4xlarge",
+      "r6gd.8xlarge",
+      "r6gd.large",
+      "r6gd.medium",
+      "r6gd.metal",
+      "r6gd.xlarge",
+      "r6i.12xlarge",
+      "r6i.16xlarge",
+      "r6i.24xlarge",
+      "r6i.2xlarge",
+      "r6i.32xlarge",
+      "r6i.4xlarge",
+      "r6i.8xlarge",
+      "r6i.large",
+      "r6i.metal",
+      "r6i.xlarge",
+      "r6id.12xlarge",
+      "r6id.16xlarge",
+      "r6id.24xlarge",
+      "r6id.2xlarge",
+      "r6id.32xlarge",
+      "r6id.4xlarge",
+      "r6id.8xlarge",
+      "r6id.large",
+      "r6id.metal",
+      "r6id.xlarge",
+      "r6idn.12xlarge",
+      "r6idn.16xlarge",
+      "r6idn.24xlarge",
+      "r6idn.2xlarge",
+      "r6idn.32xlarge",
+      "r6idn.4xlarge",
+      "r6idn.8xlarge",
+      "r6idn.large",
+      "r6idn.metal",
+      "r6idn.xlarge",
+      "r6in.12xlarge",
+      "r6in.16xlarge",
+      "r6in.24xlarge",
+      "r6in.2xlarge",
+      "r6in.32xlarge",
+      "r6in.4xlarge",
+      "r6in.8xlarge",
+      "r6in.large",
+      "r6in.metal",
+      "r6in.xlarge",
+      "r7a.12xlarge",
+      "r7a.16xlarge",
+      "r7a.24xlarge",
+      "r7a.2xlarge",
+      "r7a.32xlarge",
+      "r7a.48xlarge",
+      "r7a.4xlarge",
+      "r7a.8xlarge",
+      "r7a.large",
+      "r7a.medium",
+      "r7a.metal-48xl",
+      "r7a.xlarge",
+      "r7g.12xlarge",
+      "r7g.16xlarge",
+      "r7g.2xlarge",
+      "r7g.4xlarge",
+      "r7g.8xlarge",
+      "r7g.large",
+      "r7g.medium",
+      "r7g.metal",
+      "r7g.xlarge",
+      "r7gd.12xlarge",
+      "r7gd.16xlarge",
+      "r7gd.2xlarge",
+      "r7gd.4xlarge",
+      "r7gd.8xlarge",
+      "r7gd.large",
+      "r7gd.medium",
+      "r7gd.metal",
+      "r7gd.xlarge",
+      "r7i.12xlarge",
+      "r7i.16xlarge",
+      "r7i.24xlarge",
+      "r7i.2xlarge",
+      "r7i.48xlarge",
+      "r7i.4xlarge",
+      "r7i.8xlarge",
+      "r7i.large",
+      "r7i.metal-24xl",
+      "r7i.metal-48xl",
+      "r7i.xlarge",
+      "r7iz.12xlarge",
+      "r7iz.16xlarge",
+      "r7iz.2xlarge",
+      "r7iz.32xlarge",
+      "r7iz.4xlarge",
+      "r7iz.8xlarge",
+      "r7iz.large",
+      "r7iz.metal-16xl",
+      "r7iz.metal-32xl",
+      "r7iz.xlarge",
+      "r8g.12xlarge",
+      "r8g.16xlarge",
+      "r8g.24xlarge",
+      "r8g.2xlarge",
+      "r8g.48xlarge",
+      "r8g.4xlarge",
+      "r8g.8xlarge",
+      "r8g.large",
+      "r8g.medium",
+      "r8g.metal-24xl",
+      "r8g.metal-48xl",
+      "r8g.xlarge",
+      "t1.micro",
+      "t2.2xlarge",
+      "t2.large",
+      "t2.medium",
+      "t2.micro",
+      "t2.nano",
+      "t2.small",
+      "t2.xlarge",
+      "t3.2xlarge",
+      "t3.large",
+      "t3.medium",
+      "t3.micro",
+      "t3.nano",
+      "t3.small",
+      "t3.xlarge",
+      "t3a.2xlarge",
+      "t3a.large",
+      "t3a.medium",
+      "t3a.micro",
+      "t3a.nano",
+      "t3a.small",
+      "t3a.xlarge",
+      "t4g.2xlarge",
+      "t4g.large",
+      "t4g.medium",
+      "t4g.micro",
+      "t4g.nano",
+      "t4g.small",
+      "t4g.xlarge",
+      "trn1.2xlarge",
+      "trn1.32xlarge",
+      "trn1n.32xlarge",
+      "u-12tb1.112xlarge",
+      "u-12tb1.metal",
+      "u-18tb1.112xlarge",
+      "u-18tb1.metal",
+      "u-24tb1.112xlarge",
+      "u-24tb1.metal",
+      "u-3tb1.56xlarge",
+      "u-6tb1.112xlarge",
+      "u-6tb1.56xlarge",
+      "u-6tb1.metal",
+      "u-9tb1.112xlarge",
+      "u-9tb1.metal",
+      "u7i-12tb.224xlarge",
+      "u7ib-12tb.224xlarge",
+      "u7in-16tb.224xlarge",
+      "u7in-24tb.224xlarge",
+      "u7in-32tb.224xlarge",
+      "vt1.24xlarge",
+      "vt1.3xlarge",
+      "vt1.6xlarge",
+      "x1.16xlarge",
+      "x1.32xlarge",
+      "x1e.16xlarge",
+      "x1e.2xlarge",
+      "x1e.32xlarge",
+      "x1e.4xlarge",
+      "x1e.8xlarge",
+      "x1e.xlarge",
+      "x2gd.12xlarge",
+      "x2gd.16xlarge",
+      "x2gd.2xlarge",
+      "x2gd.4xlarge",
+      "x2gd.8xlarge",
+      "x2gd.large",
+      "x2gd.medium",
+      "x2gd.metal",
+      "x2gd.xlarge",
+      "x2idn.16xlarge",
+      "x2idn.24xlarge",
+      "x2idn.32xlarge",
+      "x2idn.metal",
+      "x2iedn.16xlarge",
+      "x2iedn.24xlarge",
+      "x2iedn.2xlarge",
+      "x2iedn.32xlarge",
+      "x2iedn.4xlarge",
+      "x2iedn.8xlarge",
+      "x2iedn.metal",
+      "x2iedn.xlarge",
+      "x2iezn.12xlarge",
+      "x2iezn.2xlarge",
+      "x2iezn.4xlarge",
+      "x2iezn.6xlarge",
+      "x2iezn.8xlarge",
+      "x2iezn.metal",
+      "z1d.12xlarge",
+      "z1d.2xlarge",
+      "z1d.3xlarge",
+      "z1d.6xlarge",
+      "z1d.large",
+      "z1d.metal",
+      "z1d.xlarge"
+     ],
      "type": "string"
     },
     "KernelId": {
@@ -564,6 +1413,10 @@
    "additionalProperties": false,
    "properties": {
     "AutoRecovery": {
+     "enum": [
+      "default",
+      "disabled"
+     ],
      "type": "string"
     }
    },
@@ -597,18 +1450,34 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpProtocolIpv6": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     },
     "InstanceMetadataTags": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     }
    },
@@ -799,6 +1668,10 @@
      "type": "boolean"
     },
     "HostnameType": {
+     "enum": [
+      "ip-name",
+      "resource-name"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayattachment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayattachment.json
index 225f8c762e..11eb0df2ef 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayattachment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayattachment.json
@@ -33,15 +33,31 @@
    "additionalProperties": false,
    "properties": {
     "ApplianceModeSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "DnsSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "Ipv6Support": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "SecurityGroupReferencingSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayconnect.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayconnect.json
index e931735094..d453a6d35f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayconnect.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayconnect.json
@@ -21,6 +21,9 @@
    "additionalProperties": false,
    "properties": {
     "Protocol": {
+     "enum": [
+      "gre"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomain.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomain.json
index 67b167cf96..6345e4f42c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomain.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewaymulticastdomain.json
@@ -29,12 +29,24 @@
    "additionalProperties": false,
    "properties": {
     "AutoAcceptSharedAssociations": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "Igmpv2Support": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "StaticSourcesSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayvpcattachment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayvpcattachment.json
index f5f6255af3..ee20c46e20 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayvpcattachment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-transitgatewayvpcattachment.json
@@ -42,15 +42,31 @@
    "additionalProperties": false,
    "properties": {
     "ApplianceModeSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "DnsSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "Ipv6Support": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     },
     "SecurityGroupReferencingSupport": {
+     "enum": [
+      "disable",
+      "enable"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-verifiedaccessendpoint.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-verifiedaccessendpoint.json
index bb68f53758..b08686b65e 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-verifiedaccessendpoint.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-verifiedaccessendpoint.json
@@ -23,6 +23,10 @@
      "type": "integer"
     },
     "Protocol": {
+     "enum": [
+      "http",
+      "https"
+     ],
      "type": "string"
     },
     "SubnetIds": {
@@ -48,6 +52,10 @@
      "type": "integer"
     },
     "Protocol": {
+     "enum": [
+      "http",
+      "https"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecr-repositorycreationtemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecr-repositorycreationtemplate.json
index 3459fe867a..8218ec0f28 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecr-repositorycreationtemplate.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecr-repositorycreationtemplate.json
@@ -36,6 +36,7 @@
   "KmsKey": {
    "maxLength": 2048,
    "minLength": 1,
+   "pattern": "^$|arn:aws:kms:[a-z0-9-]+:[0-9]{12}:key\\/[a-z0-9-]+",
    "type": "string"
   },
   "Tag": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-cluster.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-cluster.json
index e3898c14ae..4e39fc20df 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-cluster.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-cluster.json
@@ -61,6 +61,11 @@
      "$ref": "#/definitions/ExecuteCommandLogConfiguration"
     },
     "Logging": {
+     "enum": [
+      "DEFAULT",
+      "NONE",
+      "OVERRIDE"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json
index 37e099399e..79baa6b983 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskdefinition.json
index 1795daeec2..fece28e7dd 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskdefinition.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ecs-taskdefinition.json
@@ -692,9 +692,23 @@
    "additionalProperties": false,
    "properties": {
     "CpuArchitecture": {
+     "enum": [
+      "ARM64",
+      "X86_64"
+     ],
      "type": "string"
     },
     "OperatingSystemFamily": {
+     "enum": [
+      "LINUX",
+      "WINDOWS_SERVER_2004_CORE",
+      "WINDOWS_SERVER_2016_FULL",
+      "WINDOWS_SERVER_2019_CORE",
+      "WINDOWS_SERVER_2019_FULL",
+      "WINDOWS_SERVER_2022_CORE",
+      "WINDOWS_SERVER_2022_FULL",
+      "WINDOWS_SERVER_20H2_CORE"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-accesspoint.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-accesspoint.json
index 07cc1c9765..8820d9c544 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-accesspoint.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-efs-accesspoint.json
@@ -83,6 +83,7 @@
     "Path": {
      "maxLength": 100,
      "minLength": 1,
+     "pattern": "^(\\/|(\\/(?!\\.)+[^$#<>;`|&?{}^*/\\n]+){1,4})$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-emrcontainers-virtualcluster.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-emrcontainers-virtualcluster.json
index 854fc9762e..fadaeade11 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-emrcontainers-virtualcluster.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-emrcontainers-virtualcluster.json
@@ -30,6 +30,9 @@
      "$ref": "#/definitions/ContainerInfo"
     },
     "Type": {
+     "enum": [
+      "EKS"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-idmappingworkflow.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-idmappingworkflow.json
index 94ba9eaa72..73e0b2a011 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-idmappingworkflow.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-idmappingworkflow.json
@@ -131,6 +131,7 @@
    "additionalProperties": false,
    "properties": {
     "IntermediateS3Path": {
+     "pattern": "^s3://[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9](/.*)?$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-matchingworkflow.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-matchingworkflow.json
index bd0f9ba6e6..7f27c00d8e 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-matchingworkflow.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-entityresolution-matchingworkflow.json
@@ -64,6 +64,7 @@
    "additionalProperties": false,
    "properties": {
     "IntermediateS3Path": {
+     "pattern": "^s3://[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9](/.*)?$",
      "type": "string"
     }
    },
@@ -140,6 +141,7 @@
      "type": "object"
     },
     "ProviderServiceArn": {
+     "pattern": "^arn:(aws|aws-us-gov|aws-cn):(entityresolution):([a-z]{2}-[a-z]{1,10}-[0-9])::providerservice/([a-zA-Z0-9_-]{1,255})/([a-zA-Z0-9_-]{1,255})$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-events-connection.json
index 788b760794..a801515fe3 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-finspace-environment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-finspace-environment.json
index d009cfa18a..19674ebd62 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-finspace-environment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-finspace-environment.json
@@ -47,6 +47,7 @@
      "type": "string"
     },
     "FederationURN": {
+     "pattern": "^[A-Za-z0-9._\\-:\\/#\\+]+$",
      "type": "string"
     },
     "SamlMetadataDocument": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json
index 7c562429fb..0f6640adfc 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json
@@ -113,6 +113,7 @@
       "LogGroupArn": {
        "maxLength": 2048,
        "minLength": 20,
+       "pattern": "[\\S]+",
        "type": "string"
       }
      },
@@ -131,11 +132,13 @@
       "BucketName": {
        "maxLength": 63,
        "minLength": 3,
+       "pattern": "[\\S]+",
        "type": "string"
       },
       "Prefix": {
        "maxLength": 1024,
        "minLength": 1,
+       "pattern": "[\\s\\S]+",
        "type": "string"
       }
      },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-gamelift-gameservergroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-gamelift-gameservergroup.json
index 825b6eaa5a..e52c2de726 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-gamelift-gameservergroup.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-gamelift-gameservergroup.json
@@ -155,6 +155,7 @@
    "type": "string"
   },
   "LaunchTemplateName": {
+   "pattern": "[a-zA-Z0-9\\(\\)\\.\\-/_]+",
    "type": "string"
   },
   "MaxSize": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-crawler.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-crawler.json
index 9b9032ba9a..821db04f2f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-crawler.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-crawler.json
@@ -140,6 +140,11 @@
    "additionalProperties": false,
    "properties": {
     "RecrawlBehavior": {
+     "enum": [
+      "CRAWL_EVENT_MODE",
+      "CRAWL_EVERYTHING",
+      "CRAWL_NEW_FOLDERS_ONLY"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-job.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-job.json
index 9a677a4bd7..9a68857daa 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-job.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-glue-job.json
@@ -45,6 +45,7 @@
      "type": "string"
     },
     "PythonVersion": {
+     "pattern": "^([2-3]|3[.]9)$",
      "type": "string"
     },
     "Runtime": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-guardduty-malwareprotectionplan.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-guardduty-malwareprotectionplan.json
index 305e44a523..399b4cad9e 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-guardduty-malwareprotectionplan.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-guardduty-malwareprotectionplan.json
@@ -50,6 +50,10 @@
    "additionalProperties": false,
    "properties": {
     "Status": {
+     "enum": [
+      "DISABLED",
+      "ENABLED"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-imagerecipe.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-imagerecipe.json
index 8abb1e4d7b..af514f8e76 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-imagerecipe.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-imagebuilder-imagerecipe.json
@@ -18,6 +18,7 @@
      "$ref": "#/definitions/SystemsManagerAgent"
     },
     "UserDataOverride": {
+     "pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-domainconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-domainconfiguration.json
index e271b4e93f..8662a07ec6 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-domainconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-domainconfiguration.json
@@ -29,6 +29,7 @@
     "ClientCertificateCallbackArn": {
      "maxLength": 170,
      "minLength": 1,
+     "pattern": "[\\s\\S]*",
      "type": "string"
     }
    },
@@ -86,6 +87,7 @@
    "properties": {
     "SecurityPolicy": {
      "maxLength": 128,
+     "pattern": "[\\s\\S]*",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-fleetmetric.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-fleetmetric.json
index 986d1b4d9c..cba2a376bb 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-fleetmetric.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-fleetmetric.json
@@ -8,6 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "Name": {
+     "enum": [
+      "Cardinality",
+      "Percentiles",
+      "Statistics"
+     ],
      "type": "string"
     },
     "Values": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-provisioningtemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-provisioningtemplate.json
index d0aed8f694..feb01025b8 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-provisioningtemplate.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-provisioningtemplate.json
@@ -9,6 +9,7 @@
    "additionalProperties": false,
    "properties": {
     "PayloadVersion": {
+     "pattern": "^[0-9-]+$",
      "type": "string"
     },
     "TargetArn": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-topicrule.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-topicrule.json
index 4b695cb9a9..10d6b95d16 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-topicrule.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iot-topicrule.json
@@ -222,6 +222,10 @@
      "type": "string"
     },
     "HashKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "HashKeyValue": {
@@ -234,6 +238,10 @@
      "type": "string"
     },
     "RangeKeyType": {
+     "enum": [
+      "NUMBER",
+      "STRING"
+     ],
      "type": "string"
     },
     "RangeKeyValue": {
@@ -270,6 +278,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -307,6 +316,7 @@
      "type": "string"
     },
     "Separator": {
+     "pattern": "([\\n\\t])|(\\r\\n)|(,)",
      "type": "string"
     }
    },
@@ -546,6 +556,7 @@
    "additionalProperties": false,
    "properties": {
     "Endpoint": {
+     "pattern": "https?://.*",
      "type": "string"
     },
     "Id": {
@@ -716,6 +727,10 @@
    "additionalProperties": false,
    "properties": {
     "MessageFormat": {
+     "enum": [
+      "JSON",
+      "RAW"
+     ],
      "type": "string"
     },
     "RoleArn": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-accesspolicy.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-accesspolicy.json
index 8070fb86a4..8f1c683933 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-accesspolicy.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-accesspolicy.json
@@ -32,6 +32,7 @@
    "additionalProperties": false,
    "properties": {
     "arn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
@@ -41,6 +42,7 @@
    "additionalProperties": false,
    "properties": {
     "arn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
@@ -50,6 +52,7 @@
    "additionalProperties": false,
    "properties": {
     "id": {
+     "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$",
      "type": "string"
     }
    },
@@ -59,6 +62,7 @@
    "additionalProperties": false,
    "properties": {
     "id": {
+     "pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$",
      "type": "string"
     }
    },
@@ -68,6 +72,7 @@
    "additionalProperties": false,
    "properties": {
     "id": {
+     "pattern": "\\S+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-gateway.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-gateway.json
index 96dfa8b0cd..beeea11a46 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-gateway.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-gateway.json
@@ -61,6 +61,7 @@
    "additionalProperties": false,
    "properties": {
     "GroupArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
@@ -73,6 +74,7 @@
    "additionalProperties": false,
    "properties": {
     "CoreDeviceThingName": {
+     "pattern": "^[a-zA-Z0-9:_-]+$",
      "type": "string"
     }
    },
@@ -85,6 +87,7 @@
    "additionalProperties": false,
    "properties": {
     "IotCoreThingName": {
+     "pattern": "^[a-zA-Z0-9:_-]+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-portal.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-portal.json
index 70b03dd9c1..55de94a3c3 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-portal.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotsitewise-portal.json
@@ -34,9 +34,11 @@
    "additionalProperties": false,
    "properties": {
     "AlarmRoleArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     },
     "NotificationLambdaArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-fuotatask.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-fuotatask.json
index 50094758e1..3afe40470f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-fuotatask.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-fuotatask.json
@@ -5,6 +5,21 @@
    "additionalProperties": false,
    "properties": {
     "RfRegion": {
+     "enum": [
+      "AS923-1",
+      "AS923-2",
+      "AS923-3",
+      "AS923-4",
+      "AU915",
+      "CN470",
+      "CN779",
+      "EU433",
+      "EU868",
+      "IN865",
+      "KR920",
+      "RU864",
+      "US915"
+     ],
      "maxLength": 64,
      "minLength": 1,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-multicastgroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-multicastgroup.json
index f80b7e9762..55f6bfe57b 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-multicastgroup.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotwireless-multicastgroup.json
@@ -5,6 +5,10 @@
    "additionalProperties": false,
    "properties": {
     "DlClass": {
+     "enum": [
+      "ClassB",
+      "ClassC"
+     ],
      "maxLength": 64,
      "minLength": 1,
      "type": "string"
@@ -16,6 +20,21 @@
      "type": "integer"
     },
     "RfRegion": {
+     "enum": [
+      "AS923-1",
+      "AS923-2",
+      "AS923-3",
+      "AS923-4",
+      "AU915",
+      "CN470",
+      "CN779",
+      "EU433",
+      "EU868",
+      "IN865",
+      "KR920",
+      "RU864",
+      "US915"
+     ],
      "maxLength": 64,
      "minLength": 1,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json
index 1710bd48a0..3cb6b4001c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json
@@ -821,6 +821,7 @@
   "LambdaArn": {
    "maxLength": 2048,
    "minLength": 1,
+   "pattern": "/arn:aws[a-zA-Z-]*:lambda:[a-z]+-[a-z]+-[0-9]:[0-9]{12}:function:[a-zA-Z0-9-_]+(\\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})?(:[a-zA-Z0-9-_]+)?/",
    "type": "string"
   },
   "LanguageCode": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kinesisfirehose-deliverystream.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kinesisfirehose-deliverystream.json
index d307c5670d..31769c9f71 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kinesisfirehose-deliverystream.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kinesisfirehose-deliverystream.json
@@ -254,6 +254,7 @@
      "type": "boolean"
     },
     "LogGroupName": {
+     "pattern": "[\\.\\-_/#A-Za-z0-9]*",
      "relationshipRef": {
       "propertyPath": "/properties/LogGroupName",
       "typeName": "AWS::Logs::LogGroup"
@@ -261,6 +262,7 @@
      "type": "string"
     },
     "LogStreamName": {
+     "pattern": "[^:*]*",
      "relationshipRef": {
       "propertyPath": "/properties/LogStreamName",
       "typeName": "AWS::Logs::LogStream"
@@ -680,11 +682,13 @@
     "Name": {
      "maxLength": 256,
      "minLength": 1,
+     "pattern": "^(?!\\s*$).+",
      "type": "string"
     },
     "Url": {
      "maxLength": 1000,
      "minLength": 1,
+     "pattern": "https://.*",
      "type": "string"
     }
    },
@@ -725,6 +729,10 @@
      "type": "string"
     },
     "S3BackupMode": {
+     "enum": [
+      "AllData",
+      "FailedDataOnly"
+     ],
      "type": "string"
     },
     "S3Configuration": {
@@ -824,6 +832,7 @@
    "additionalProperties": false,
    "properties": {
     "AWSKMSKeyARN": {
+     "pattern": "arn:.*",
      "relationshipRef": {
       "propertyPath": "/properties/Arn",
       "typeName": "AWS::KMS::Key"
@@ -937,6 +946,11 @@
      "type": "number"
     },
     "Compression": {
+     "enum": [
+      "NONE",
+      "SNAPPY",
+      "ZLIB"
+     ],
      "type": "string"
     },
     "DictionaryKeyThreshold": {
@@ -946,6 +960,10 @@
      "type": "boolean"
     },
     "FormatVersion": {
+     "enum": [
+      "V0_11",
+      "V0_12"
+     ],
      "type": "string"
     },
     "PaddingTolerance": {
@@ -976,6 +994,11 @@
      "type": "integer"
     },
     "Compression": {
+     "enum": [
+      "GZIP",
+      "SNAPPY",
+      "UNCOMPRESSED"
+     ],
      "type": "string"
     },
     "EnableDictionaryCompression": {
@@ -988,6 +1011,10 @@
      "type": "integer"
     },
     "WriterVersion": {
+     "enum": [
+      "V1",
+      "V2"
+     ],
      "type": "string"
     }
    },
@@ -1081,6 +1108,7 @@
     "ClusterJDBCURL": {
      "maxLength": 512,
      "minLength": 1,
+     "pattern": "jdbc:(redshift|postgresql)://((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+(redshift(-serverless)?)\\.([a-zA-Z0-9\\.]+):\\d{1,5}/[a-zA-Z0-9_$-]+",
      "type": "string"
     },
     "CopyCommand": {
@@ -1218,9 +1246,11 @@
    "additionalProperties": false,
    "properties": {
     "CatalogId": {
+     "pattern": "^\\S+$",
      "type": "string"
     },
     "DatabaseName": {
+     "pattern": "^\\S+$",
      "relationshipRef": {
       "propertyPath": "/properties/Id",
       "typeName": "AWS::Glue::Database"
@@ -1228,6 +1258,7 @@
      "type": "string"
     },
     "Region": {
+     "pattern": "^\\S+$",
      "type": "string"
     },
     "RoleARN": {
@@ -1241,6 +1272,7 @@
      "type": "string"
     },
     "TableName": {
+     "pattern": "^\\S+$",
      "relationshipRef": {
       "propertyPath": "/properties/Id",
       "typeName": "AWS::Glue::Table"
@@ -1248,6 +1280,7 @@
      "type": "string"
     },
     "VersionId": {
+     "pattern": "^\\S+$",
      "type": "string"
     }
    },
@@ -1507,6 +1540,10 @@
      "$ref": "#/definitions/SplunkRetryOptions"
     },
     "S3BackupMode": {
+     "enum": [
+      "AllEvents",
+      "FailedEventsOnly"
+     ],
      "type": "string"
     },
     "S3Configuration": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-lambda-eventsourcemapping.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-lambda-eventsourcemapping.json
index bc4874d3aa..c2e5d160ca 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-lambda-eventsourcemapping.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-lambda-eventsourcemapping.json
@@ -39,11 +39,13 @@
     "CollectionName": {
      "maxLength": 57,
      "minLength": 1,
+     "pattern": "(^(?!(system\\x2e)))(^[_a-zA-Z0-9])([^$]*)",
      "type": "string"
     },
     "DatabaseName": {
      "maxLength": 63,
      "minLength": 1,
+     "pattern": "[^ /\\.$\\x22]*",
      "type": "string"
     },
     "FullDocument": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-license.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-license.json
index 38a5e255a7..18d1b564f1 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-license.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-license.json
@@ -31,6 +31,11 @@
      "$ref": "#/definitions/ProvisionalConfiguration"
     },
     "RenewType": {
+     "enum": [
+      "Monthly",
+      "None",
+      "Weekly"
+     ],
      "type": "string"
     }
    },
@@ -115,10 +120,12 @@
    "properties": {
     "Begin": {
      "format": "date-time",
+     "pattern": "^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|[+-](?:2[ 0-3]|[0-1][0-9]):[0-5][0-9])+$",
      "type": "string"
     },
     "End": {
      "format": "date-time",
+     "pattern": "^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\\.[0-9]+)?(Z|[+-](?:2[ 0-3]|[0-1][0-9]):[0-5][0-9])+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-lightsail-distribution.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-lightsail-distribution.json
index c28fdb044e..3325aed99c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-lightsail-distribution.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-lightsail-distribution.json
@@ -9,6 +9,10 @@
    "additionalProperties": false,
    "properties": {
     "Behavior": {
+     "enum": [
+      "cache",
+      "dont-cache"
+     ],
      "type": "string"
     }
    },
@@ -30,9 +34,11 @@
    "additionalProperties": false,
    "properties": {
     "AllowedHTTPMethods": {
+     "pattern": ".*\\S.*",
      "type": "string"
     },
     "CachedHTTPMethods": {
+     "pattern": ".*\\S.*",
      "type": "string"
     },
     "DefaultTTL": {
@@ -71,6 +77,11 @@
      "uniqueItems": true
     },
     "Option": {
+     "enum": [
+      "all",
+      "allow-list",
+      "none"
+     ],
      "type": "string"
     }
    },
@@ -88,6 +99,11 @@
      "uniqueItems": true
     },
     "Option": {
+     "enum": [
+      "all",
+      "allow-list",
+      "none"
+     ],
      "type": "string"
     }
    },
@@ -97,12 +113,34 @@
    "additionalProperties": false,
    "properties": {
     "Name": {
+     "pattern": "\\w[\\w\\-]*\\w",
      "type": "string"
     },
     "ProtocolPolicy": {
+     "enum": [
+      "http-only",
+      "https-only"
+     ],
      "type": "string"
     },
     "RegionName": {
+     "enum": [
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-south-1",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ca-central-1",
+      "eu-central-1",
+      "eu-north-1",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "us-east-1",
+      "us-east-2",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-lookoutequipment-inferencescheduler.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-lookoutequipment-inferencescheduler.json
index aece1b496e..a131f5a5ac 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-lookoutequipment-inferencescheduler.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-lookoutequipment-inferencescheduler.json
@@ -31,6 +31,7 @@
   "Prefix": {
    "maxLength": 1024,
    "minLength": 0,
+   "pattern": "(^$)|([\\u0009\\u000A\\u000D\\u0020-\\u00FF]{1,1023}/$)",
    "type": "string"
   },
   "S3InputConfiguration": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-msk-cluster.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-msk-cluster.json
index 5290f4ea02..e39b3b1ddc 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-msk-cluster.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-msk-cluster.json
@@ -28,6 +28,9 @@
    "additionalProperties": false,
    "properties": {
     "BrokerAZDistribution": {
+     "enum": [
+      "DEFAULT"
+     ],
      "maxLength": 9,
      "minLength": 6,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-connectattachment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-connectattachment.json
index 49196b6353..3e5de67ec9 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-connectattachment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-connectattachment.json
@@ -11,6 +11,10 @@
    "additionalProperties": false,
    "properties": {
     "Protocol": {
+     "enum": [
+      "GRE",
+      "NO_ENCAP"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-device.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-device.json
index a4278577be..4ab6b98c36 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-device.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-device.json
@@ -13,9 +13,11 @@
    "additionalProperties": false,
    "properties": {
     "SubnetArn": {
+     "pattern": "^arn:[^:]{1,63}:ec2:[^:]{0,63}:[^:]{0,63}:subnet\\/subnet-[0-9a-f]{8,17}$|^$",
      "type": "string"
     },
     "Zone": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     }
    },
@@ -25,12 +27,15 @@
    "additionalProperties": false,
    "properties": {
     "Address": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     },
     "Latitude": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     },
     "Longitude": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-site.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-site.json
index 247a6b1c03..8070598035 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-site.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-networkmanager-site.json
@@ -13,12 +13,15 @@
    "additionalProperties": false,
    "properties": {
     "Address": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     },
     "Latitude": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     },
     "Longitude": {
+     "pattern": "[\\s\\S]*",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json
index ea5044ce0a..fb8010d752 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-pipes-pipe.json
@@ -1511,6 +1511,7 @@
      "type": "string"
     },
     "BucketOwner": {
+     "pattern": "\\d{12}",
      "type": "string"
     },
     "OutputFormat": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-refreshschedule.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-refreshschedule.json
index c3236118fb..1acf04d103 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-refreshschedule.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-quicksight-refreshschedule.json
@@ -36,6 +36,7 @@
         "DayOfMonth": {
          "maxLength": 128,
          "minLength": 1,
+         "pattern": "^(?:LAST_DAY_OF_MONTH|1[0-9]|2[0-8]|[12]|[3-9])$",
          "type": "string"
         },
         "DayOfWeek": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-resourcegroups-group.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-resourcegroups-group.json
index 5e7295f215..6443bc9ee6 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-resourcegroups-group.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-resourcegroups-group.json
@@ -42,6 +42,7 @@
   },
   "Query": {
    "additionalProperties": false,
+   "pattern": "[\\s\\S]*",
    "properties": {
     "ResourceTypeFilters": {
      "items": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-route53-healthcheck.json
index 4257b4c3e7..a654467a72 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-route53-healthcheck.json
@@ -15,6 +15,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-s3-bucket.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-s3-bucket.json
index 51724471d8..8d9ed7d842 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-s3-bucket.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-s3-bucket.json
@@ -586,6 +586,9 @@
    "properties": {
     "ObjectLockEnabled": {
      "const": "Enabled",
+     "enum": [
+      "Enabled"
+     ],
      "type": "string"
     },
     "Rule": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json
index 751c23f435..0b605670d0 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-cluster.json
@@ -125,6 +125,7 @@
    "additionalProperties": false,
    "properties": {
     "ClusterArn": {
+     "pattern": "^arn:aws[a-z\\-]*:eks:[a-z0-9\\-]*:[0-9]{12}:cluster\\/[0-9A-Za-z][A-Za-z0-9\\-_]{0,99}$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json
index 83c8914e4a..28898b302a 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-dataqualityjobdefinition.json
@@ -65,11 +65,74 @@
      "type": "integer"
     },
     "InstanceType": {
+     "enum": [
+      "ml.c4.2xlarge",
+      "ml.c4.4xlarge",
+      "ml.c4.8xlarge",
+      "ml.c4.xlarge",
+      "ml.c5.18xlarge",
+      "ml.c5.2xlarge",
+      "ml.c5.4xlarge",
+      "ml.c5.9xlarge",
+      "ml.c5.xlarge",
+      "ml.g4dn.12xlarge",
+      "ml.g4dn.16xlarge",
+      "ml.g4dn.2xlarge",
+      "ml.g4dn.4xlarge",
+      "ml.g4dn.8xlarge",
+      "ml.g4dn.xlarge",
+      "ml.g5.12xlarge",
+      "ml.g5.16xlarge",
+      "ml.g5.24xlarge",
+      "ml.g5.2xlarge",
+      "ml.g5.48xlarge",
+      "ml.g5.4xlarge",
+      "ml.g5.8xlarge",
+      "ml.g5.xlarge",
+      "ml.m4.10xlarge",
+      "ml.m4.16xlarge",
+      "ml.m4.2xlarge",
+      "ml.m4.4xlarge",
+      "ml.m4.xlarge",
+      "ml.m5.12xlarge",
+      "ml.m5.24xlarge",
+      "ml.m5.2xlarge",
+      "ml.m5.4xlarge",
+      "ml.m5.large",
+      "ml.m5.xlarge",
+      "ml.p2.16xlarge",
+      "ml.p2.8xlarge",
+      "ml.p2.xlarge",
+      "ml.p3.16xlarge",
+      "ml.p3.2xlarge",
+      "ml.p3.8xlarge",
+      "ml.r5.12xlarge",
+      "ml.r5.16xlarge",
+      "ml.r5.24xlarge",
+      "ml.r5.2xlarge",
+      "ml.r5.4xlarge",
+      "ml.r5.8xlarge",
+      "ml.r5.large",
+      "ml.r5.xlarge",
+      "ml.r5d.12xlarge",
+      "ml.r5d.16xlarge",
+      "ml.r5d.24xlarge",
+      "ml.r5d.2xlarge",
+      "ml.r5d.4xlarge",
+      "ml.r5d.8xlarge",
+      "ml.r5d.large",
+      "ml.r5d.xlarge",
+      "ml.t3.2xlarge",
+      "ml.t3.large",
+      "ml.t3.medium",
+      "ml.t3.xlarge"
+     ],
      "type": "string"
     },
     "VolumeKmsKeyId": {
      "maximum": 2048,
      "minimum": 1,
+     "pattern": "^[a-zA-Z0-9:/_-]*$",
      "type": "string"
     },
     "VolumeSizeInGB": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-featuregroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-featuregroup.json
index 97a5a190ab..91be339816 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-featuregroup.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-featuregroup.json
@@ -65,6 +65,7 @@
   },
   "KmsKeyId": {
    "maxLength": 2048,
+   "pattern": "^[a-zA-Z0-9:/_-]*$",
    "type": "string"
   },
   "OnlineStoreSecurityConfig": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json
index 4dc1c10d1a..d2ee9a5fc5 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelbiasjobdefinition.json
@@ -83,11 +83,74 @@
      "type": "integer"
     },
     "InstanceType": {
+     "enum": [
+      "ml.c4.2xlarge",
+      "ml.c4.4xlarge",
+      "ml.c4.8xlarge",
+      "ml.c4.xlarge",
+      "ml.c5.18xlarge",
+      "ml.c5.2xlarge",
+      "ml.c5.4xlarge",
+      "ml.c5.9xlarge",
+      "ml.c5.xlarge",
+      "ml.g4dn.12xlarge",
+      "ml.g4dn.16xlarge",
+      "ml.g4dn.2xlarge",
+      "ml.g4dn.4xlarge",
+      "ml.g4dn.8xlarge",
+      "ml.g4dn.xlarge",
+      "ml.g5.12xlarge",
+      "ml.g5.16xlarge",
+      "ml.g5.24xlarge",
+      "ml.g5.2xlarge",
+      "ml.g5.48xlarge",
+      "ml.g5.4xlarge",
+      "ml.g5.8xlarge",
+      "ml.g5.xlarge",
+      "ml.m4.10xlarge",
+      "ml.m4.16xlarge",
+      "ml.m4.2xlarge",
+      "ml.m4.4xlarge",
+      "ml.m4.xlarge",
+      "ml.m5.12xlarge",
+      "ml.m5.24xlarge",
+      "ml.m5.2xlarge",
+      "ml.m5.4xlarge",
+      "ml.m5.large",
+      "ml.m5.xlarge",
+      "ml.p2.16xlarge",
+      "ml.p2.8xlarge",
+      "ml.p2.xlarge",
+      "ml.p3.16xlarge",
+      "ml.p3.2xlarge",
+      "ml.p3.8xlarge",
+      "ml.r5.12xlarge",
+      "ml.r5.16xlarge",
+      "ml.r5.24xlarge",
+      "ml.r5.2xlarge",
+      "ml.r5.4xlarge",
+      "ml.r5.8xlarge",
+      "ml.r5.large",
+      "ml.r5.xlarge",
+      "ml.r5d.12xlarge",
+      "ml.r5d.16xlarge",
+      "ml.r5d.24xlarge",
+      "ml.r5d.2xlarge",
+      "ml.r5d.4xlarge",
+      "ml.r5d.8xlarge",
+      "ml.r5d.large",
+      "ml.r5d.xlarge",
+      "ml.t3.2xlarge",
+      "ml.t3.large",
+      "ml.t3.medium",
+      "ml.t3.xlarge"
+     ],
      "type": "string"
     },
     "VolumeKmsKeyId": {
      "maximum": 2048,
      "minimum": 1,
+     "pattern": "^[a-zA-Z0-9:/_-]*$",
      "type": "string"
     },
     "VolumeSizeInGB": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json
index abb0a6d55e..8adce5bcba 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelexplainabilityjobdefinition.json
@@ -73,11 +73,74 @@
      "type": "integer"
     },
     "InstanceType": {
+     "enum": [
+      "ml.c4.2xlarge",
+      "ml.c4.4xlarge",
+      "ml.c4.8xlarge",
+      "ml.c4.xlarge",
+      "ml.c5.18xlarge",
+      "ml.c5.2xlarge",
+      "ml.c5.4xlarge",
+      "ml.c5.9xlarge",
+      "ml.c5.xlarge",
+      "ml.g4dn.12xlarge",
+      "ml.g4dn.16xlarge",
+      "ml.g4dn.2xlarge",
+      "ml.g4dn.4xlarge",
+      "ml.g4dn.8xlarge",
+      "ml.g4dn.xlarge",
+      "ml.g5.12xlarge",
+      "ml.g5.16xlarge",
+      "ml.g5.24xlarge",
+      "ml.g5.2xlarge",
+      "ml.g5.48xlarge",
+      "ml.g5.4xlarge",
+      "ml.g5.8xlarge",
+      "ml.g5.xlarge",
+      "ml.m4.10xlarge",
+      "ml.m4.16xlarge",
+      "ml.m4.2xlarge",
+      "ml.m4.4xlarge",
+      "ml.m4.xlarge",
+      "ml.m5.12xlarge",
+      "ml.m5.24xlarge",
+      "ml.m5.2xlarge",
+      "ml.m5.4xlarge",
+      "ml.m5.large",
+      "ml.m5.xlarge",
+      "ml.p2.16xlarge",
+      "ml.p2.8xlarge",
+      "ml.p2.xlarge",
+      "ml.p3.16xlarge",
+      "ml.p3.2xlarge",
+      "ml.p3.8xlarge",
+      "ml.r5.12xlarge",
+      "ml.r5.16xlarge",
+      "ml.r5.24xlarge",
+      "ml.r5.2xlarge",
+      "ml.r5.4xlarge",
+      "ml.r5.8xlarge",
+      "ml.r5.large",
+      "ml.r5.xlarge",
+      "ml.r5d.12xlarge",
+      "ml.r5d.16xlarge",
+      "ml.r5d.24xlarge",
+      "ml.r5d.2xlarge",
+      "ml.r5d.4xlarge",
+      "ml.r5d.8xlarge",
+      "ml.r5d.large",
+      "ml.r5d.xlarge",
+      "ml.t3.2xlarge",
+      "ml.t3.large",
+      "ml.t3.medium",
+      "ml.t3.xlarge"
+     ],
      "type": "string"
     },
     "VolumeKmsKeyId": {
      "maximum": 2048,
      "minimum": 1,
+     "pattern": "^[a-zA-Z0-9:/_-]*$",
      "type": "string"
     },
     "VolumeSizeInGB": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json
index ae4718acfc..d79eba865c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelqualityjobdefinition.json
@@ -79,11 +79,74 @@
      "type": "integer"
     },
     "InstanceType": {
+     "enum": [
+      "ml.c4.2xlarge",
+      "ml.c4.4xlarge",
+      "ml.c4.8xlarge",
+      "ml.c4.xlarge",
+      "ml.c5.18xlarge",
+      "ml.c5.2xlarge",
+      "ml.c5.4xlarge",
+      "ml.c5.9xlarge",
+      "ml.c5.xlarge",
+      "ml.g4dn.12xlarge",
+      "ml.g4dn.16xlarge",
+      "ml.g4dn.2xlarge",
+      "ml.g4dn.4xlarge",
+      "ml.g4dn.8xlarge",
+      "ml.g4dn.xlarge",
+      "ml.g5.12xlarge",
+      "ml.g5.16xlarge",
+      "ml.g5.24xlarge",
+      "ml.g5.2xlarge",
+      "ml.g5.48xlarge",
+      "ml.g5.4xlarge",
+      "ml.g5.8xlarge",
+      "ml.g5.xlarge",
+      "ml.m4.10xlarge",
+      "ml.m4.16xlarge",
+      "ml.m4.2xlarge",
+      "ml.m4.4xlarge",
+      "ml.m4.xlarge",
+      "ml.m5.12xlarge",
+      "ml.m5.24xlarge",
+      "ml.m5.2xlarge",
+      "ml.m5.4xlarge",
+      "ml.m5.large",
+      "ml.m5.xlarge",
+      "ml.p2.16xlarge",
+      "ml.p2.8xlarge",
+      "ml.p2.xlarge",
+      "ml.p3.16xlarge",
+      "ml.p3.2xlarge",
+      "ml.p3.8xlarge",
+      "ml.r5.12xlarge",
+      "ml.r5.16xlarge",
+      "ml.r5.24xlarge",
+      "ml.r5.2xlarge",
+      "ml.r5.4xlarge",
+      "ml.r5.8xlarge",
+      "ml.r5.large",
+      "ml.r5.xlarge",
+      "ml.r5d.12xlarge",
+      "ml.r5d.16xlarge",
+      "ml.r5d.24xlarge",
+      "ml.r5d.2xlarge",
+      "ml.r5d.4xlarge",
+      "ml.r5d.8xlarge",
+      "ml.r5d.large",
+      "ml.r5d.xlarge",
+      "ml.t3.2xlarge",
+      "ml.t3.large",
+      "ml.t3.medium",
+      "ml.t3.xlarge"
+     ],
      "type": "string"
     },
     "VolumeKmsKeyId": {
      "maximum": 2048,
      "minimum": 1,
+     "pattern": "^[a-zA-Z0-9:/_-]*$",
      "type": "string"
     },
     "VolumeSizeInGB": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json
index e97cdbbb1a..2de2db7609 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-monitoringschedule.json
@@ -67,11 +67,74 @@
      "type": "integer"
     },
     "InstanceType": {
+     "enum": [
+      "ml.c4.2xlarge",
+      "ml.c4.4xlarge",
+      "ml.c4.8xlarge",
+      "ml.c4.xlarge",
+      "ml.c5.18xlarge",
+      "ml.c5.2xlarge",
+      "ml.c5.4xlarge",
+      "ml.c5.9xlarge",
+      "ml.c5.xlarge",
+      "ml.g4dn.12xlarge",
+      "ml.g4dn.16xlarge",
+      "ml.g4dn.2xlarge",
+      "ml.g4dn.4xlarge",
+      "ml.g4dn.8xlarge",
+      "ml.g4dn.xlarge",
+      "ml.g5.12xlarge",
+      "ml.g5.16xlarge",
+      "ml.g5.24xlarge",
+      "ml.g5.2xlarge",
+      "ml.g5.48xlarge",
+      "ml.g5.4xlarge",
+      "ml.g5.8xlarge",
+      "ml.g5.xlarge",
+      "ml.m4.10xlarge",
+      "ml.m4.16xlarge",
+      "ml.m4.2xlarge",
+      "ml.m4.4xlarge",
+      "ml.m4.xlarge",
+      "ml.m5.12xlarge",
+      "ml.m5.24xlarge",
+      "ml.m5.2xlarge",
+      "ml.m5.4xlarge",
+      "ml.m5.large",
+      "ml.m5.xlarge",
+      "ml.p2.16xlarge",
+      "ml.p2.8xlarge",
+      "ml.p2.xlarge",
+      "ml.p3.16xlarge",
+      "ml.p3.2xlarge",
+      "ml.p3.8xlarge",
+      "ml.r5.12xlarge",
+      "ml.r5.16xlarge",
+      "ml.r5.24xlarge",
+      "ml.r5.2xlarge",
+      "ml.r5.4xlarge",
+      "ml.r5.8xlarge",
+      "ml.r5.large",
+      "ml.r5.xlarge",
+      "ml.r5d.12xlarge",
+      "ml.r5d.16xlarge",
+      "ml.r5d.24xlarge",
+      "ml.r5d.2xlarge",
+      "ml.r5d.4xlarge",
+      "ml.r5d.8xlarge",
+      "ml.r5d.large",
+      "ml.r5d.xlarge",
+      "ml.t3.2xlarge",
+      "ml.t3.large",
+      "ml.t3.medium",
+      "ml.t3.xlarge"
+     ],
      "type": "string"
     },
     "VolumeKmsKeyId": {
      "maximum": 2048,
      "minimum": 1,
+     "pattern": "^[a-zA-Z0-9:/_-]*$",
      "type": "string"
     },
     "VolumeSizeInGB": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ssm-resourcedatasync.json
index b281948f6c..794f3073a8 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ssm-resourcedatasync.json
@@ -56,6 +56,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "maxLength": 1024,
      "minLength": 1,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-synthetics-canary.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-synthetics-canary.json
index 372446d251..a949f9f0d1 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-synthetics-canary.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-synthetics-canary.json
@@ -47,6 +47,7 @@
    ],
    "properties": {
     "Handler": {
+     "pattern": "^([0-9a-zA-Z_-]+\\/)*[0-9A-Za-z_\\\\-]+\\.[A-Za-z_][A-Za-z0-9_]*$",
      "type": "string"
     },
     "S3Bucket": {
@@ -104,9 +105,14 @@
    "additionalProperties": false,
    "properties": {
     "EncryptionMode": {
+     "enum": [
+      "SSE_KMS",
+      "SSE_S3"
+     ],
      "type": "string"
     },
     "KmsKeyArn": {
+     "pattern": "arn:(aws[a-zA-Z-]*)?:kms:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:key/[\\w\\-\\/]+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-rulegroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-rulegroup.json
index ae13f3f8ab..57513d62ae 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-rulegroup.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-rulegroup.json
@@ -1262,6 +1262,7 @@
     "MetricName": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "^[\\w#:\\.\\-/]+$",
      "type": "string"
     },
     "SampledRequestsEnabled": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-webacl.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-webacl.json
index d253406941..3ddc78b0aa 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-webacl.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-wafv2-webacl.json
@@ -1792,6 +1792,7 @@
     "MetricName": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "^[\\w#:\\.\\-/]+$",
      "type": "string"
     },
     "SampledRequestsEnabled": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-events-connection.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/us_east_2/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/us_east_2/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json
index 33366dff06..944f5608ad 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-scalingpolicy.json
index 3ec51d0018..f9f928f78e 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-scalingpolicy.json
@@ -145,6 +145,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -158,6 +162,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-crawler.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-crawler.json
index 7dcb87f3d8..7d289febb1 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-crawler.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-crawler.json
@@ -140,6 +140,11 @@
    "additionalProperties": false,
    "properties": {
     "RecrawlBehavior": {
+     "enum": [
+      "CRAWL_EVENT_MODE",
+      "CRAWL_EVERYTHING",
+      "CRAWL_NEW_FOLDERS_ONLY"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-job.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-job.json
index 10b7901aa4..44b15a937e 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-job.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-glue-job.json
@@ -33,6 +33,7 @@
      "type": "string"
     },
     "PythonVersion": {
+     "pattern": "^([2-3]|3[.]9)$",
      "type": "string"
     },
     "Runtime": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-lambda-eventsourcemapping.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-lambda-eventsourcemapping.json
index 6dfb16d107..284a344082 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-lambda-eventsourcemapping.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-lambda-eventsourcemapping.json
@@ -39,11 +39,13 @@
     "CollectionName": {
      "maxLength": 57,
      "minLength": 1,
+     "pattern": "(^(?!(system\\x2e)))(^[_a-zA-Z0-9])([^$]*)",
      "type": "string"
     },
     "DatabaseName": {
      "maxLength": 63,
      "minLength": 1,
+     "pattern": "[^ /\\.$\\x22]*",
      "type": "string"
     },
     "FullDocument": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-synthetics-canary.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-synthetics-canary.json
index 39efc725c3..2cdb5bba30 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-synthetics-canary.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-synthetics-canary.json
@@ -47,6 +47,7 @@
    ],
    "properties": {
     "Handler": {
+     "pattern": "^([0-9a-zA-Z_-]+\\/)*[0-9A-Za-z_\\\\-]+\\.[A-Za-z_][A-Za-z0-9_]*$",
      "type": "string"
     },
     "S3Bucket": {
@@ -98,9 +99,14 @@
    "additionalProperties": false,
    "properties": {
     "EncryptionMode": {
+     "enum": [
+      "SSE_KMS",
+      "SSE_S3"
+     ],
      "type": "string"
     },
     "KmsKeyArn": {
+     "pattern": "arn:(aws[a-zA-Z-]*)?:kms:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:key/[\\w\\-\\/]+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-rulegroup.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-rulegroup.json
index b38749240d..cb1d20c343 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-rulegroup.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-rulegroup.json
@@ -1231,6 +1231,7 @@
     "MetricName": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "^[\\w#:\\.\\-/]+$",
      "type": "string"
     },
     "SampledRequestsEnabled": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-webacl.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-webacl.json
index a7b525f179..586a90abca 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-webacl.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-wafv2-webacl.json
@@ -1761,6 +1761,7 @@
     "MetricName": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "^[\\w#:\\.\\-/]+$",
      "type": "string"
     },
     "SampledRequestsEnabled": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json
index 33366dff06..944f5608ad 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json
@@ -88,12 +88,20 @@
    "additionalProperties": false,
    "properties": {
     "HttpEndpoint": {
+     "enum": [
+      "disabled",
+      "enabled"
+     ],
      "type": "string"
     },
     "HttpPutResponseHopLimit": {
      "type": "integer"
     },
     "HttpTokens": {
+     "enum": [
+      "optional",
+      "required"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-scalingpolicy.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-scalingpolicy.json
index 3ec51d0018..f9f928f78e 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-scalingpolicy.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-scalingpolicy.json
@@ -145,6 +145,10 @@
    "additionalProperties": false,
    "properties": {
     "MaxCapacityBreachBehavior": {
+     "enum": [
+      "HonorMaxCapacity",
+      "IncreaseMaxCapacity"
+     ],
      "type": "string"
     },
     "MaxCapacityBuffer": {
@@ -158,6 +162,10 @@
      "uniqueItems": true
     },
     "Mode": {
+     "enum": [
+      "ForecastAndScale",
+      "ForecastOnly"
+     ],
      "type": "string"
     },
     "SchedulingBufferTime": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json
index ba7baa1de3..d49394eae0 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ecs-service.json
@@ -169,6 +169,16 @@
    "additionalProperties": false,
    "properties": {
     "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
      "type": "string"
     },
     "Options": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-crawler.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-crawler.json
index 7dcb87f3d8..7d289febb1 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-crawler.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-crawler.json
@@ -140,6 +140,11 @@
    "additionalProperties": false,
    "properties": {
     "RecrawlBehavior": {
+     "enum": [
+      "CRAWL_EVENT_MODE",
+      "CRAWL_EVERYTHING",
+      "CRAWL_NEW_FOLDERS_ONLY"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-job.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-job.json
index 10b7901aa4..44b15a937e 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-job.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-glue-job.json
@@ -33,6 +33,7 @@
      "type": "string"
     },
     "PythonVersion": {
+     "pattern": "^([2-3]|3[.]9)$",
      "type": "string"
     },
     "Runtime": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-iotsitewise-portal.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-iotsitewise-portal.json
index 68f42ea09d..8f5a9706e1 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-iotsitewise-portal.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-iotsitewise-portal.json
@@ -34,9 +34,11 @@
    "additionalProperties": false,
    "properties": {
     "AlarmRoleArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     },
     "NotificationLambdaArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-lambda-eventsourcemapping.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-lambda-eventsourcemapping.json
index 6dfb16d107..284a344082 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-lambda-eventsourcemapping.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-lambda-eventsourcemapping.json
@@ -39,11 +39,13 @@
     "CollectionName": {
      "maxLength": 57,
      "minLength": 1,
+     "pattern": "(^(?!(system\\x2e)))(^[_a-zA-Z0-9])([^$]*)",
      "type": "string"
     },
     "DatabaseName": {
      "maxLength": 63,
      "minLength": 1,
+     "pattern": "[^ /\\.$\\x22]*",
      "type": "string"
     },
     "FullDocument": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-route53-healthcheck.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-route53-healthcheck.json
index e45baa386f..4d7ead27d7 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-route53-healthcheck.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-route53-healthcheck.json
@@ -8,6 +8,45 @@
      "type": "string"
     },
     "Region": {
+     "enum": [
+      "af-south-1",
+      "ap-east-1",
+      "ap-northeast-1",
+      "ap-northeast-2",
+      "ap-northeast-3",
+      "ap-south-1",
+      "ap-south-2",
+      "ap-southeast-1",
+      "ap-southeast-2",
+      "ap-southeast-3",
+      "ap-southeast-4",
+      "ap-southeast-5",
+      "ca-central-1",
+      "ca-west-1",
+      "cn-north-1",
+      "cn-northwest-1",
+      "eu-central-1",
+      "eu-central-2",
+      "eu-north-1",
+      "eu-south-1",
+      "eu-south-2",
+      "eu-west-1",
+      "eu-west-2",
+      "eu-west-3",
+      "il-central-1",
+      "me-central-1",
+      "me-south-1",
+      "sa-east-1",
+      "us-east-1",
+      "us-east-2",
+      "us-gov-east-1",
+      "us-gov-west-1",
+      "us-iso-east-1",
+      "us-iso-west-1",
+      "us-isob-east-1",
+      "us-west-1",
+      "us-west-2"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ssm-resourcedatasync.json
index 4ca9deebb1..3a9d119fb6 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ssm-resourcedatasync.json
@@ -46,6 +46,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-synthetics-canary.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-synthetics-canary.json
index 39efc725c3..2cdb5bba30 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-synthetics-canary.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-synthetics-canary.json
@@ -47,6 +47,7 @@
    ],
    "properties": {
     "Handler": {
+     "pattern": "^([0-9a-zA-Z_-]+\\/)*[0-9A-Za-z_\\\\-]+\\.[A-Za-z_][A-Za-z0-9_]*$",
      "type": "string"
     },
     "S3Bucket": {
@@ -98,9 +99,14 @@
    "additionalProperties": false,
    "properties": {
     "EncryptionMode": {
+     "enum": [
+      "SSE_KMS",
+      "SSE_S3"
+     ],
      "type": "string"
     },
     "KmsKeyArn": {
+     "pattern": "arn:(aws[a-zA-Z-]*)?:kms:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:key/[\\w\\-\\/]+",
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-rulegroup.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-rulegroup.json
index b38749240d..cb1d20c343 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-rulegroup.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-rulegroup.json
@@ -1231,6 +1231,7 @@
     "MetricName": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "^[\\w#:\\.\\-/]+$",
      "type": "string"
     },
     "SampledRequestsEnabled": {
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-webacl.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-webacl.json
index a7b525f179..586a90abca 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-webacl.json
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-wafv2-webacl.json
@@ -1761,6 +1761,7 @@
     "MetricName": {
      "maxLength": 128,
      "minLength": 1,
+     "pattern": "^[\\w#:\\.\\-/]+$",
      "type": "string"
     },
     "SampledRequestsEnabled": {
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-appsync-datasource.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-appsync-datasource.json
index 06c91688b2..465e8de1f5 100644
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-appsync-datasource.json
+++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-appsync-datasource.json
@@ -9,6 +9,9 @@
    "additionalProperties": false,
    "properties": {
     "AuthorizationType": {
+     "enum": [
+      "AWS_IAM"
+     ],
      "type": "string"
     },
     "AwsIamConfig": {
@@ -181,6 +184,9 @@
      "$ref": "#/definitions/RdsHttpEndpointConfig"
     },
     "RelationalDatabaseSourceType": {
+     "enum": [
+      "RDS_HTTP_ENDPOINT"
+     ],
      "type": "string"
     }
    },
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-events-connection.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-ssm-resourcedatasync.json
index ec87640906..c3bbb7edbe 100644
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-ssm-resourcedatasync.json
+++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-ssm-resourcedatasync.json
@@ -56,6 +56,9 @@
      "type": "string"
     },
     "SyncFormat": {
+     "enum": [
+      "JsonSerDe"
+     ],
      "maxLength": 1024,
      "minLength": 1,
      "type": "string"
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-events-connection.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-events-connection.json
index c49843c440..2e965c720c 100644
--- a/src/cfnlint/data/schemas/providers/us_west_2/aws-events-connection.json
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-events-connection.json
@@ -8,9 +8,11 @@
    "additionalProperties": false,
    "properties": {
     "ApiKeyName": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ApiKeyValue": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -61,9 +63,11 @@
    "additionalProperties": false,
    "properties": {
     "Password": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "Username": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -77,9 +81,11 @@
    "additionalProperties": false,
    "properties": {
     "ClientID": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     },
     "ClientSecret": {
+     "pattern": "^[ \\t]*[^\\x00-\\x1F:\\x7F]+([ \\t]+[^\\x00-\\x1F:\\x7F]+)*[ \\t]*$",
      "type": "string"
     }
    },
@@ -119,6 +125,7 @@
     "AuthorizationEndpoint": {
      "maxLength": 2048,
      "minLength": 1,
+     "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$",
      "type": "string"
     },
     "ClientParameters": {
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-iotsitewise-portal.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-iotsitewise-portal.json
index 68f42ea09d..8f5a9706e1 100644
--- a/src/cfnlint/data/schemas/providers/us_west_2/aws-iotsitewise-portal.json
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-iotsitewise-portal.json
@@ -34,9 +34,11 @@
    "additionalProperties": false,
    "properties": {
     "AlarmRoleArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     },
     "NotificationLambdaArn": {
+     "pattern": "^arn:aws(-cn|-us-gov)?:[a-zA-Z0-9-:\\/_\\.]+$",
      "type": "string"
     }
    },