Merge branch 'main' into dependabot/docker/docker/library/python-3.13…

…-alpine3.20
aws-cloudformation · Oct 21, 2024 · 295202e · 295202e
2 parents 978b411 + 6cece36
commit 295202e
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 31 deletions.
diff --git a/scripts/boto/update_schemas_from_boto.py b/scripts/boto/update_schemas_from_boto.py
@@ -70,7 +70,7 @@ def build_resource_type_patches(
                 if not value:
                     continue
                 if field == "pattern":
-                    if value == ".*":
+                    if value in [".*", "^.*$"]:
                         continue
                     try:
                         re.compile(value)

diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appsync_functionconfiguration/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appsync_functionconfiguration/boto.json
@@ -8,15 +8,5 @@
   "op": "add",
   "path": "/properties/DataSourceName/pattern",
   "value": "[_A-Za-z][_0-9A-Za-z]*"
- },
- {
-  "op": "add",
-  "path": "/properties/RequestMappingTemplate/pattern",
-  "value": "^.*$"
- },
- {
-  "op": "add",
-  "path": "/properties/ResponseMappingTemplate/pattern",
-  "value": "^.*$"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appsync_resolver/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appsync_resolver/boto.json
@@ -14,16 +14,6 @@
   "path": "/properties/DataSourceName/pattern",
   "value": "[_A-Za-z][_0-9A-Za-z]*"
  },
- {
-  "op": "add",
-  "path": "/properties/RequestMappingTemplate/pattern",
-  "value": "^.*$"
- },
- {
-  "op": "add",
-  "path": "/properties/ResponseMappingTemplate/pattern",
-  "value": "^.*$"
- },
  {
   "op": "add",
   "path": "/properties/Kind/enum",

diff --git a/...t/data/schemas/patches/extensions/all/aws_codestarconnections_syncconfiguration/boto.json b/...t/data/schemas/patches/extensions/all/aws_codestarconnections_syncconfiguration/boto.json
@@ -1,9 +1,4 @@
 [
- {
-  "op": "add",
-  "path": "/properties/Branch/pattern",
-  "value": "^.*$"
- },
  {
   "op": "add",
   "path": "/properties/RoleArn/pattern",

diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_integration/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_integration/boto.json
@@ -0,0 +1,7 @@
+[
+ {
+  "op": "add",
+  "path": "/properties/IntegrationName/pattern",
+  "value": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$"
+ }
+]
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
@@ -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_1/aws-autoscaling-autoscalinggroup.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-autoscaling-autoscalinggroup.json
@@ -516,8 +516,10 @@
   },
   "HealthCheckType": {
    "enum": [
+    "EBS",
     "EC2",
-    "ELB"
+    "ELB",
+    "VPC_LATTICE"
    ],
    "type": "string"
   },

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
@@ -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-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/us_east_1/aws-appsync-functionconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appsync-functionconfiguration.json
@@ -85,14 +85,12 @@
    "type": "string"
   },
   "RequestMappingTemplate": {
-   "pattern": "^.*$",
    "type": "string"
   },
   "RequestMappingTemplateS3Location": {
    "type": "string"
   },
   "ResponseMappingTemplate": {
-   "pattern": "^.*$",
    "type": "string"
   },
   "ResponseMappingTemplateS3Location": {

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
@@ -129,7 +129,6 @@
    "$ref": "#/definitions/PipelineConfig"
   },
   "RequestMappingTemplate": {
-   "pattern": "^.*$",
    "type": "string"
   },
   "RequestMappingTemplateS3Location": {
@@ -139,7 +138,6 @@
    "type": "string"
   },
   "ResponseMappingTemplate": {
-   "pattern": "^.*$",
    "type": "string"
   },
   "ResponseMappingTemplateS3Location": {