diff --git a/docs/rules.md b/docs/rules.md index ab4b7694e8..cf6f74da0a 100644 --- a/docs/rules.md +++ b/docs/rules.md @@ -46,7 +46,7 @@ To include these rules, use the `-e/include-experimental` argument when running ## Rules (_This documentation is generated by running `cfn-lint --update-documentation`, do not alter this manually_) -The following **239** rules are applied by this linter: +The following **241** rules are applied by this linter: | Rule ID | Title | Description | Config
(Name:Type:Default) | Source | Tags | | -------- | ----- | ----------- | ---------- | ------ | ---- | @@ -76,17 +76,19 @@ The following **239** rules are applied by this linter: | [E1030](../src/cfnlint/rules/functions/Length.py) | Length validation of parameters | Making sure Fn::Length is configured correctly | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-length.html) | `functions`,`length` | | [E1031](../src/cfnlint/rules/functions/ToJsonString.py) | ToJsonString validation of parameters | Making sure Fn::ToJsonString is configured correctly | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html) | `functions`,`toJsonString` | | [E1032](../src/cfnlint/rules/functions/ForEach.py) | Validates ForEach functions | Validates that ForEach parameters have a valid configuration | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getatt.html) | `functions`,`foreach` | -| [E1040](../src/cfnlint/rules/functions/GetAttFormat.py) | Check if GetAtt matches destination format | Validate that if source and destination format exists that they match | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/best-practices.html#parmtypes) | `parameters`,`ec2`,`imageid` | +| [E1040](../src/cfnlint/rules/functions/GetAttFormat.py) | Check if GetAtt matches destination format | Validate that if source and destination format exists that they match | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/best-practices.html#parmtypes) | `functions`,`getatt` | +| [E1041](../src/cfnlint/rules/functions/RefFormat.py) | Check if Ref matches destination format | When source and destination format exists validate that they match in a Ref | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/best-practices.html#parmtypes) | `functions`,`ref` | | [E1050](../src/cfnlint/rules/functions/DynamicReference.py) | Validate the structure of a dynamic reference | Make sure dynamic reference strings have the correct syntax | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/dynamic-references.html) | `functions`,`dynamic reference` | | [E1051](../src/cfnlint/rules/functions/DynamicReferenceSecretsManagerPath.py) | Validate dynamic references to secrets manager are only in resource properties | Dynamic references from secrets manager can only be used in resource properties | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/dynamic-references.html#dynamic-references-secretsmanager) | `functions`,`dynamic reference` | | [E1052](../src/cfnlint/rules/functions/DynamicReferenceSsmPath.py) | Validate dynamic references to SSM are in a valid location | Dynamic references to SSM parameters are only supported in certain locations | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/dynamic-references.html#dynamic-references-ssm) | `functions`,`dynamic reference` | | [E1101](../src/cfnlint/rules/jsonschema/CfnLint.py) | Validate an item against additional checks | Use supplemental logic to validate properties against | | [Source]() | | | [E1103](../src/cfnlint/rules/formats/Format.py) | Validate the format of a value | Parent rule for validating the format keyword in schemas | | [Source]() | | -| [E1150](../src/cfnlint/rules/formats/SecurityGroupId.py) | Validate security group format | Security groups have to ref/gettatt to a security group or has the valid pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::SecurityGroup.GroupId) | | +| [E1150](../src/cfnlint/rules/formats/SecurityGroupId.py) | Validate security group format | Security groups have to ref/gettatt to a security group or has the valid pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::SecurityGroup.Id) | | | [E1151](../src/cfnlint/rules/formats/VpcId.py) | Validate VPC id format | Check that a VPC id matches a pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::VPC.Id) | | | [E1152](../src/cfnlint/rules/formats/ImageId.py) | Validate AMI id format | Check that a AMI id matches a pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::Image.Id) | | -| [E1153](../src/cfnlint/rules/formats/SecurityGroupName.py) | Validate security group name | Security group names have to valid pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::SecurityGroup.GroupName) | | +| [E1153](../src/cfnlint/rules/formats/SecurityGroupName.py) | Validate security group name | Security group names have to valid pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::SecurityGroup.Name) | | | [E1154](../src/cfnlint/rules/formats/SubnetId.py) | Validate VPC subnet id format | Check that a VPC subnet id matches a pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::EC2::Subnet.Id) | | +| [E1155](../src/cfnlint/rules/formats/LogGroupName.py) | Validate CloudWatch logs group name | Check that a CloudWatch log group name matches a pattern | | [Source](https://github.com/aws-cloudformation/cfn-lint/blob/main/docs/format_keyword.md#AWS::Logs::LogGroup.Name) | | | [E1700](../src/cfnlint/rules/rules/Configuration.py) | Rules have the appropriate configuration | Making sure the Rules section is properly configured | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/rules-section-structure.html) | `rules` | | [E1701](../src/cfnlint/rules/rules/Assert.py) | Validate the configuration of Assertions | Make sure the Assert value in a Rule is properly configured | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/rules-section-structure.html) | `rules` | | [E1702](../src/cfnlint/rules/rules/RuleCondition.py) | Validate the configuration of Rules RuleCondition | Make sure the RuleCondition in a Rule is properly configured | | [Source](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/rules-section-structure.html) | `rules` | diff --git a/src/cfnlint/data/AdditionalSpecs/Policies.json b/src/cfnlint/data/AdditionalSpecs/Policies.json index 5c611bce4c..e806d443ae 100644 --- a/src/cfnlint/data/AdditionalSpecs/Policies.json +++ b/src/cfnlint/data/AdditionalSpecs/Policies.json @@ -2181,6 +2181,7 @@ "RegisterOrganizationDelegatedAdmin", "RemoveTags", "RestoreEventDataStore", + "SearchSampleQueries", "StartDashboardRefresh", "StartEventDataStoreIngestion", "StartImport", @@ -5770,6 +5771,7 @@ "DescribeFHIRExportJobWithGet", "DescribeFHIRImportJob", "GetCapabilities", + "GetExportedFile", "ListFHIRDatastores", "ListFHIRExportJobs", "ListFHIRImportJobs", @@ -5779,6 +5781,7 @@ "SearchWithGet", "SearchWithPost", "StartFHIRExportJob", + "StartFHIRExportJobWithGet", "StartFHIRExportJobWithPost", "StartFHIRImportJob", "TagResource", @@ -14436,6 +14439,7 @@ "DeleteContactEvaluation", "DeleteContactFlow", "DeleteContactFlowModule", + "DeleteContactFlowVersion", "DeleteEmailAddress", "DeleteEvaluationForm", "DeleteHoursOfOperation", @@ -15127,7 +15131,10 @@ "conditionKeys": [ "aws:RequestTag/${TagKey}", "aws:ResourceTag/${TagKey}", - "aws:TagKeys" + "aws:TagKeys", + "datazone:domainId", + "datazone:projectId", + "datazone:userId" ] }, "Amazon Detective": { diff --git a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json index 4d4a06a053..0ddbbf39e7 100644 --- a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json @@ -1 +1 @@ -{"etag": "\"91791f53d414564db7cbbceaefd59f7a\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"ef5f6a90ec31c9e559e0d26f70d0c330\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json index 1b28c114e2..78e83a6ed0 100644 --- a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json @@ -1 +1 @@ -{"etag": "\"1d368feb392c9238293424f22c4ffecd\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"} +{"etag": "\"1b71c0df24e28609ebbcba6903826ad3\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json index 2fdf8932c5..8104c88995 100644 --- a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json @@ -1 +1 @@ -{"etag": "\"fcc739d65ac9611f3ae58889b5ed1dc4\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"aad29d6d6d24b3633b2dbb941b5faccc\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json index 3243b46a3c..87d49923e0 100644 --- a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json @@ -1 +1 @@ -{"etag": "\"436de8b4c9c2dee7797804b5df85d5b9\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"255d6a524641de4df9f23ed650b333b9\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json index 2888f980e7..289de6d5dc 100644 --- a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json @@ -1 +1 @@ -{"etag": "\"221c4d1a9d10c9315e0ec8587dbea986\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"76cf00007f5c233124b6772a6f89ff65\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json index 007475100a..becc81b9c3 100644 --- a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json @@ -1 +1 @@ -{"etag": "\"0cbc4482c76af92fbc6eea221cdb9c98\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"0af023ff27a7298fd837ffb3eb0e785d\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json index fe12093365..872492868c 100644 --- a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json @@ -1 +1 @@ -{"etag": "\"c823754c9178a7fafa1bed463c372d89\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"40e0bc914f894c31ed7bbf231b85b95d\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json index a501c062e1..4ee79878ad 100644 --- a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json @@ -1 +1 @@ -{"etag": "\"c7a1f96603c2f7c761969d8e74de566e\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"} +{"etag": "\"60ec4b5d1344b16826360dc7a88a65e7\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json index a2e4729157..9a2e8d0fca 100644 --- a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json @@ -1 +1 @@ -{"etag": "\"590e86f2a1e3385fea04ad561fddb9c1\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"92c9001eaf3ac7d3bd0fa3fb04aa1b36\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json index c12c4ea621..7424906d74 100644 --- a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json @@ -1 +1 @@ -{"etag": "\"4f4207eee4a69ce7239383cdfd6a9f5d\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"8e99768145beeeeca93a3ebdfbc2f8fa\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json index b769d34340..609416cf7f 100644 --- a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json @@ -1 +1 @@ -{"etag": "\"dee69b39f5065715f44431593be4a8fb\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"145a934c3a152b9495300802708c1704\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json index c9209a5e36..534eead7e9 100644 --- a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json @@ -1 +1 @@ -{"etag": "\"25561abddab9670c6847decaea2cee17\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"e62a403cb2d9fc66d5028d2d8cb27c57\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json index 6f53e43f99..b7426f41df 100644 --- a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json @@ -1 +1 @@ -{"etag": "\"c83e911c87a4d3c34e01c983af9c9eef\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"84cb0c343d912fc480a58f236dc3f2f5\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json index 74db9c3a61..0d3e7371f6 100644 --- a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json @@ -1 +1 @@ -{"etag": "\"3edf4bb213b2ce927ac0f081ca07bee3\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"3728843b2711bfda3cf848f84c0f1fbd\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json index d97cc1a602..77454a07b3 100644 --- a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json @@ -1 +1 @@ -{"etag": "\"a6ad2713dee9133b83f0a84a30cf0438\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"112cb8c8d465ce2452d938c6e17a741f\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json index 744af0a45d..a0c88b11e6 100644 --- a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json @@ -1 +1 @@ -{"etag": "\"8e7a8e4d44d86c36bd47803e6b216d90\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"d991583c4118d39e92380624361f27e7\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json index c0e44cf858..ed379303c1 100644 --- a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json @@ -1 +1 @@ -{"etag": "\"71c1b7578d6b772fb2554f5e9609d056\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"fbc154ee02d8ad6b4816c27864d8ba27\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json index 14e237979f..5bdec9edf4 100644 --- a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json @@ -1 +1 @@ -{"etag": "\"fab8df43535ac3b0a078a018a5201cf9\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"75c1e3fad81313ee42c1ec56d7de4691\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json b/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json index 0b27a0d04b..d4b29dd3a9 100644 --- a/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json @@ -1 +1 @@ -{"etag": "\"782358bbfb4f85f297e01b7d96ab058b\"", "url": "https://schema.cloudformation.ap-southeast-7.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"e295fe416b09aa37a824092c5ef1bad2\"", "url": "https://schema.cloudformation.ap-southeast-7.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json index dbfca61a49..f916ac711c 100644 --- a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json @@ -1 +1 @@ -{"etag": "\"4fa7e32211cad343b7554dcd4aa5115f\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"b3b5be2f4cb63bd4879aa172bcd649b0\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json index faa49cb865..2530a1e925 100644 --- a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json @@ -1 +1 @@ -{"etag": "\"acd24b3c720250c5322f1fd431bdd8a6\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"b015685b22341374e223f600df7a4184\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json index 784533abaf..448cd65302 100644 --- a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json @@ -1 +1 @@ -{"etag": "\"8c3c26295c12d5fd0768fe25b0e23704\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"03b2878381d8c767de501509a242a8b5\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json index 9acb43d364..37a47e4f9e 100644 --- a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json @@ -1 +1 @@ -{"etag": "\"f6dc3aefe61ba028746825c07904d9f8\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"2130ef263198b5b040974dad34441114\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json index a97e413b3c..5f7848ef06 100644 --- a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json @@ -1 +1 @@ -{"etag": "\"573c4d96761e48ad0bde544742d8e494\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"a6de5332203612cc08d30c0a97767d00\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json index d1151c28fb..81c5445f5c 100644 --- a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json @@ -1 +1 @@ -{"etag": "\"76f411d041441e0593a4c4fd2b454e0a\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"5fba86efe8d92780a10eaedb42b97b94\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json index 3d7c6d718e..70e9ff3dcd 100644 --- a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json @@ -1 +1 @@ -{"etag": "\"803b6cb7c9af8e7ead19a14efc475e68\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"a207517b259cb5e76a24ecb77f7964db\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json index 0b8ebf75d3..49e967af6a 100644 --- a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json @@ -1 +1 @@ -{"etag": "\"79d8af5b8b8146526af29619358b73ee\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"87548e13aea8ef21b80711a720d9d455\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json index 6d336c4f90..a41c04c10a 100644 --- a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json @@ -1 +1 @@ -{"etag": "\"60c9690c517de5cb59a41ed5d867c1fb\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"d2e887cde7b7762d136f97b24995aaa0\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json index 48170840b5..3ae864da2f 100644 --- a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json @@ -1 +1 @@ -{"etag": "\"08a79e162a116588e6d2ecae02d26d7b\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"f3b9ab75f745997d4cd5ed22047f0e78\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json index ca64deaaef..57c8677a80 100644 --- a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json @@ -1 +1 @@ -{"etag": "\"a8a861b985be8d64ea710c622ff8713b\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"52c21f1173d8dd19776cd3230b26849b\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json index ee70f02a95..1433a15d4c 100644 --- a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json @@ -1 +1 @@ -{"etag": "\"5146f2790da5ca092889ae7e938ab15e\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"d0361ea4b3cc5368bde2bea76dc81481\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json index 1cd4f8e795..42be8a890e 100644 --- a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json @@ -1 +1 @@ -{"etag": "\"d6523eaa0ebe6391b66fdb5e6a53c2f5\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"6fedf0cd53979a8bd5a1ec71e5fc2516\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json index b5b48a6681..c12587cb3e 100644 --- a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json @@ -1 +1 @@ -{"etag": "\"6648106b37560fe53b0ad16ade488048\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"18055cc26e6a5c1bde9f4e482f75c31d\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json index a19f163f5f..0ec54e2aae 100644 --- a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json @@ -1 +1 @@ -{"etag": "\"452d03cdc679fe474f5d1103c48c3c1a\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"44874faa27bfc8d133ae9c9487e2cb8e\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json index df947a0c35..c421c5a7de 100644 --- a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json @@ -1 +1 @@ -{"etag": "\"08eb30332494d51ce03c5ca2ba8ad3f7\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"5930f9f1c08e6922ff04ae08f9a6367f\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/schemas/extensions/aws_neptune_dbinstance/dbinstanceclass_enum.json b/src/cfnlint/data/schemas/extensions/aws_neptune_dbinstance/dbinstanceclass_enum.json index 25f26d733e..691c164630 100644 --- a/src/cfnlint/data/schemas/extensions/aws_neptune_dbinstance/dbinstanceclass_enum.json +++ b/src/cfnlint/data/schemas/extensions/aws_neptune_dbinstance/dbinstanceclass_enum.json @@ -46,6 +46,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -118,6 +127,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -190,6 +208,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -262,6 +289,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -334,6 +370,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -406,6 +451,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -478,6 +532,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -550,6 +613,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -622,6 +694,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -694,6 +775,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -766,6 +856,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -838,6 +937,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -910,6 +1018,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -982,6 +1099,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1054,6 +1180,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1126,6 +1261,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1198,6 +1342,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1270,6 +1423,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1342,6 +1504,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1414,6 +1585,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1486,6 +1666,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1558,6 +1747,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1630,6 +1828,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1702,6 +1909,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1774,6 +1990,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1846,6 +2071,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1918,6 +2152,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", @@ -1990,6 +2233,15 @@ "db.r6i.8xlarge", "db.r6i.large", "db.r6i.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.serverless", "db.t3.medium", "db.t4g.medium", diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json index cf91b76769..4d82131f9d 100644 --- a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json +++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json @@ -137,7 +137,8 @@ "16.3", "16.4", "16.4-limitless", - "16.6" + "16.6", + "16.6-limitless" ] } } diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json index b61cb62301..77e1d6f5d3 100644 --- a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json +++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json @@ -153,7 +153,8 @@ "16.3", "16.4", "16.4-limitless", - "16.6" + "16.6", + "16.6-limitless" ] } } diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_verifiedaccessendpoint/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_verifiedaccessendpoint/boto.json index 8e98649730..1716f9679c 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_verifiedaccessendpoint/boto.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_verifiedaccessendpoint/boto.json @@ -33,5 +33,23 @@ "https", "tcp" ] + }, + { + "op": "add", + "path": "/definitions/RdsOptions/properties/Protocol/enum", + "value": [ + "http", + "https", + "tcp" + ] + }, + { + "op": "add", + "path": "/definitions/CidrOptions/properties/Protocol/enum", + "value": [ + "http", + "https", + "tcp" + ] } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/boto.json index b8d3e3a11e..5ae9da2f9e 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/boto.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_eks_nodegroup/boto.json @@ -30,6 +30,14 @@ "PREFER_NO_SCHEDULE" ] }, + { + "op": "add", + "path": "/definitions/UpdateConfig/properties/UpdateStrategy/enum", + "value": [ + "DEFAULT", + "MINIMAL" + ] + }, { "op": "add", "path": "/properties/CapacityType/enum", diff --git a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py index 465b941ce1..4c0e58d105 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py @@ -112,6 +112,9 @@ "AWS::CDK::Metadata", "AWS::CE::AnomalyMonitor", "AWS::CE::AnomalySubscription", + "AWS::Cassandra::Keyspace", + "AWS::Cassandra::Table", + "AWS::Cassandra::Type", "AWS::CertificateManager::Account", "AWS::CertificateManager::Certificate", "AWS::Chatbot::CustomAction", @@ -977,6 +980,9 @@ "aws-batch-jobdefinition.json", "aws-batch-jobqueue.json", "aws-batch-schedulingpolicy.json", + "aws-cassandra-keyspace.json", + "aws-cassandra-table.json", + "aws-cassandra-type.json", "aws-ce-anomalymonitor.json", "aws-ce-anomalysubscription.json", "aws-certificatemanager-account.json", @@ -1026,6 +1032,7 @@ "aws-cloudwatch-compositealarm.json", "aws-cloudwatch-dashboard.json", "aws-cloudwatch-insightrule.json", + "aws-cloudwatch-metricstream.json", "aws-codebuild-project.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudwatch-metricstream.json deleted file mode 100644 index 89ca2654d5..0000000000 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudwatch-metricstream.json +++ /dev/null @@ -1,228 +0,0 @@ -{ - "additionalProperties": false, - "allOf": [ - { - "required": [ - "FirehoseArn", - "RoleArn", - "OutputFormat" - ] - }, - { - "oneOf": [ - {}, - { - "required": [ - "IncludeFilters", - "ExcludeFilters" - ] - } - ] - } - ], - "createOnlyProperties": [ - "/properties/Name" - ], - "definitions": { - "MetricStreamFilter": { - "additionalProperties": false, - "properties": { - "MetricNames": { - "items": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "maxItems": 999, - "type": "array" - }, - "Namespace": { - "maxLength": 255, - "minLength": 1, - "pattern": "[^:].*", - "type": "string" - } - }, - "required": [ - "Namespace" - ], - "type": "object" - }, - "MetricStreamStatisticsConfiguration": { - "additionalProperties": false, - "properties": { - "AdditionalStatistics": { - "items": { - "type": "string" - }, - "maxItems": 20, - "type": "array", - "uniqueItems": true - }, - "IncludeMetrics": { - "items": { - "$ref": "#/definitions/MetricStreamStatisticsMetric" - }, - "maxItems": 100, - "type": "array", - "uniqueItems": true - } - }, - "required": [ - "AdditionalStatistics", - "IncludeMetrics" - ], - "type": "object" - }, - "MetricStreamStatisticsMetric": { - "additionalProperties": false, - "properties": { - "MetricName": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "Namespace": { - "maxLength": 255, - "minLength": 1, - "pattern": "[^:].*", - "type": "string" - } - }, - "required": [ - "MetricName", - "Namespace" - ], - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "CreationDate": { - "anyOf": [ - { - "format": "date-time" - }, - { - "format": "timestamp" - } - ], - "type": "string" - }, - "ExcludeFilters": { - "items": { - "$ref": "#/definitions/MetricStreamFilter" - }, - "maxItems": 1000, - "type": "array", - "uniqueItems": true - }, - "FirehoseArn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "IncludeFilters": { - "items": { - "$ref": "#/definitions/MetricStreamFilter" - }, - "maxItems": 1000, - "type": "array", - "uniqueItems": true - }, - "IncludeLinkedAccountsMetrics": { - "type": "boolean" - }, - "LastUpdateDate": { - "anyOf": [ - { - "format": "date-time" - }, - { - "format": "timestamp" - } - ], - "type": "string" - }, - "Name": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "OutputFormat": { - "enum": [ - "json", - "opentelemetry0.7", - "opentelemetry1.0" - ], - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "RoleArn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "State": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "StatisticsConfigurations": { - "items": { - "$ref": "#/definitions/MetricStreamStatisticsConfiguration" - }, - "maxItems": 100, - "type": "array", - "uniqueItems": true - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreationDate", - "/properties/LastUpdateDate", - "/properties/State" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git", - "taggable": true, - "typeName": "AWS::CloudWatch::MetricStream", - "writeOnlyProperties": [ - "/properties/Tags" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py index e621f07118..eb40c15d8c 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py @@ -1613,7 +1613,6 @@ "aws-ec2-transitgatewayroutetableassociation.json", "aws-ec2-transitgatewayroutetablepropagation.json", "aws-ec2-transitgatewayvpcattachment.json", - "aws-ec2-verifiedaccessendpoint.json", "aws-ec2-verifiedaccessgroup.json", "aws-ec2-verifiedaccessinstance.json", "aws-ec2-verifiedaccesstrustprovider.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-verifiedaccessendpoint.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-verifiedaccessendpoint.json similarity index 65% rename from src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-verifiedaccessendpoint.json rename to src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-verifiedaccessendpoint.json index e89c87abee..6d447b6039 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-verifiedaccessendpoint.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-verifiedaccessendpoint.json @@ -8,44 +8,9 @@ "/properties/EndpointType", "/properties/SecurityGroupIds", "/properties/NetworkInterfaceOptions/NetworkInterfaceId", - "/properties/LoadBalancerOptions/LoadBalancerArn", - "/properties/RdsOptions/Protocol", - "/properties/RdsOptions/RdsDbInstanceArn", - "/properties/RdsOptions/RdsDbClusterArn", - "/properties/RdsOptions/RdsDbProxyArn", - "/properties/CidrOptions/Cidr", - "/properties/CidrOptions/Protocol", - "/properties/CidrOptions/SubnetIds" + "/properties/LoadBalancerOptions/LoadBalancerArn" ], "definitions": { - "CidrOptions": { - "additionalProperties": false, - "properties": { - "Cidr": { - "type": "string" - }, - "PortRanges": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/PortRange" - }, - "type": "array", - "uniqueItems": true - }, - "Protocol": { - "type": "string" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array", - "uniqueItems": true - } - }, - "type": "object" - }, "LoadBalancerOptions": { "additionalProperties": false, "properties": { @@ -57,14 +22,6 @@ "minimum": 1, "type": "integer" }, - "PortRanges": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/PortRange" - }, - "type": "array", - "uniqueItems": true - }, "Protocol": { "enum": [ "http", @@ -95,14 +52,6 @@ "minimum": 1, "type": "integer" }, - "PortRanges": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/PortRange" - }, - "type": "array", - "uniqueItems": true - }, "Protocol": { "enum": [ "http", @@ -114,56 +63,6 @@ }, "type": "object" }, - "PortRange": { - "additionalProperties": false, - "properties": { - "FromPort": { - "maximum": 65535, - "minimum": 1, - "type": "integer" - }, - "ToPort": { - "maximum": 65535, - "minimum": 1, - "type": "integer" - } - }, - "type": "object" - }, - "RdsOptions": { - "additionalProperties": false, - "properties": { - "Port": { - "maximum": 65535, - "minimum": 1, - "type": "integer" - }, - "Protocol": { - "type": "string" - }, - "RdsDbClusterArn": { - "type": "string" - }, - "RdsDbInstanceArn": { - "type": "string" - }, - "RdsDbProxyArn": { - "type": "string" - }, - "RdsEndpoint": { - "type": "string" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array", - "uniqueItems": true - } - }, - "type": "object" - }, "SecurityGroupId": { "format": "AWS::EC2::SecurityGroup.Id", "type": "string" @@ -217,9 +116,6 @@ ], "type": "string" }, - "CidrOptions": { - "$ref": "#/definitions/CidrOptions" - }, "CreationTime": { "type": "string" }, @@ -262,9 +158,6 @@ "PolicyEnabled": { "type": "boolean" }, - "RdsOptions": { - "$ref": "#/definitions/RdsOptions" - }, "SecurityGroupIds": { "format": "AWS::EC2::SecurityGroup.Ids", "insertionOrder": false, @@ -308,9 +201,12 @@ "/properties/VerifiedAccessInstanceId" ], "required": [ + "ApplicationDomain", "AttachmentType", + "DomainCertificateArn", "EndpointType", - "VerifiedAccessGroupId" + "VerifiedAccessGroupId", + "EndpointDomainPrefix" ], "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ec2-verified-access.aws-ec2-verifiedaccessendpoint", "tagging": { diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py index 6bc85ce46e..812210a15b 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py @@ -1612,6 +1612,7 @@ "aws-ec2-vpcendpointservicepermissions.json", "aws-ec2-vpcgatewayattachment.json", "aws-ec2-vpcpeeringconnection.json", + "aws-ec2-vpnconnection.json", "aws-ec2-vpnconnectionroute.json", "aws-ec2-vpngateway.json", "aws-ec2-vpngatewayroutepropagation.json", @@ -1684,6 +1685,7 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", + "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-forecast-dataset.json", "aws-forecast-datasetgroup.json", @@ -1696,7 +1698,6 @@ "aws-gamelift-build.json", "aws-gamelift-fleet.json", "aws-gamelift-gameservergroup.json", - "aws-gamelift-gamesessionqueue.json", "aws-gamelift-location.json", "aws-gamelift-script.json", "aws-globalaccelerator-accelerator.json", @@ -2290,6 +2291,7 @@ "aws-synthetics-group.json", "aws-systemsmanagersap-application.json", "aws-timestream-database.json", + "aws-timestream-influxdbinstance.json", "aws-timestream-scheduledquery.json", "aws-timestream-table.json", "aws-transfer-agreement.json", diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpnconnection.json deleted file mode 100644 index 5f9a8ac704..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpnconnection.json +++ /dev/null @@ -1,384 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json", - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/CustomerGatewayId", - "/properties/VpnGatewayId", - "/properties/TransitGatewayId", - "/properties/EnableAcceleration", - "/properties/LocalIpv4NetworkCidr", - "/properties/LocalIpv6NetworkCidr", - "/properties/OutsideIpAddressType", - "/properties/RemoteIpv4NetworkCidr", - "/properties/RemoteIpv6NetworkCidr", - "/properties/StaticRoutesOnly", - "/properties/TransportTransitGatewayAttachmentId", - "/properties/TunnelInsideIpVersion", - "/properties/VpnTunnelOptionsSpecifications" - ], - "definitions": { - "CloudwatchLogOptionsSpecification": { - "additionalProperties": false, - "properties": { - "LogEnabled": { - "type": "boolean" - }, - "LogGroupArn": { - "type": "string" - }, - "LogOutputFormat": { - "enum": [ - "json", - "text" - ], - "type": "string" - } - }, - "type": "object" - }, - "IKEVersionsRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - "ikev1", - "ikev2" - ], - "type": "string" - } - }, - "type": "object" - }, - "Phase1DHGroupNumbersRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - 2, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24 - ], - "type": "integer" - } - }, - "type": "object" - }, - "Phase1EncryptionAlgorithmsRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - "AES128", - "AES256", - "AES128-GCM-16", - "AES256-GCM-16" - ], - "type": "string" - } - }, - "type": "object" - }, - "Phase1IntegrityAlgorithmsRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - "SHA1", - "SHA2-256", - "SHA2-384", - "SHA2-512" - ], - "type": "string" - } - }, - "type": "object" - }, - "Phase2DHGroupNumbersRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - 2, - 5, - 14, - 15, - 16, - 17, - 18, - 19, - 20, - 21, - 22, - 23, - 24 - ], - "type": "integer" - } - }, - "type": "object" - }, - "Phase2EncryptionAlgorithmsRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - "AES128", - "AES256", - "AES128-GCM-16", - "AES256-GCM-16" - ], - "type": "string" - } - }, - "type": "object" - }, - "Phase2IntegrityAlgorithmsRequestListValue": { - "additionalProperties": false, - "properties": { - "Value": { - "enum": [ - "SHA1", - "SHA2-256", - "SHA2-384", - "SHA2-512" - ], - "type": "string" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "type": "string" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "VpnTunnelLogOptionsSpecification": { - "additionalProperties": false, - "properties": { - "CloudwatchLogOptions": { - "$ref": "#/definitions/CloudwatchLogOptionsSpecification" - } - }, - "type": "object" - }, - "VpnTunnelOptionsSpecification": { - "additionalProperties": false, - "properties": { - "DPDTimeoutAction": { - "enum": [ - "clear", - "none", - "restart" - ], - "type": "string" - }, - "DPDTimeoutSeconds": { - "minimum": 30, - "type": "integer" - }, - "EnableTunnelLifecycleControl": { - "type": "boolean" - }, - "IKEVersions": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/IKEVersionsRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "LogOptions": { - "$ref": "#/definitions/VpnTunnelLogOptionsSpecification" - }, - "Phase1DHGroupNumbers": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "Phase1EncryptionAlgorithms": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "Phase1IntegrityAlgorithms": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "Phase1LifetimeSeconds": { - "maximum": 28800, - "minimum": 900, - "type": "integer" - }, - "Phase2DHGroupNumbers": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "Phase2EncryptionAlgorithms": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "Phase2IntegrityAlgorithms": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue" - }, - "type": "array", - "uniqueItems": false - }, - "Phase2LifetimeSeconds": { - "maximum": 3600, - "minimum": 900, - "type": "integer" - }, - "PreSharedKey": { - "type": "string" - }, - "RekeyFuzzPercentage": { - "maximum": 100, - "minimum": 0, - "type": "integer" - }, - "RekeyMarginTimeSeconds": { - "minimum": 60, - "type": "integer" - }, - "ReplayWindowSize": { - "maximum": 2048, - "minimum": 64, - "type": "integer" - }, - "StartupAction": { - "enum": [ - "add", - "start" - ], - "type": "string" - }, - "TunnelInsideCidr": { - "type": "string" - }, - "TunnelInsideIpv6Cidr": { - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/VpnConnectionId" - ], - "properties": { - "CustomerGatewayId": { - "type": "string" - }, - "EnableAcceleration": { - "type": "boolean" - }, - "LocalIpv4NetworkCidr": { - "type": "string" - }, - "LocalIpv6NetworkCidr": { - "type": "string" - }, - "OutsideIpAddressType": { - "type": "string" - }, - "RemoteIpv4NetworkCidr": { - "type": "string" - }, - "RemoteIpv6NetworkCidr": { - "type": "string" - }, - "StaticRoutesOnly": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array", - "uniqueItems": false - }, - "TransitGatewayId": { - "type": "string" - }, - "TransportTransitGatewayAttachmentId": { - "type": "string" - }, - "TunnelInsideIpVersion": { - "type": "string" - }, - "Type": { - "type": "string" - }, - "VpnConnectionId": { - "type": "string" - }, - "VpnGatewayId": { - "type": "string" - }, - "VpnTunnelOptionsSpecifications": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/VpnTunnelOptionsSpecification" - }, - "type": "array", - "uniqueItems": false - } - }, - "readOnlyProperties": [ - "/properties/VpnConnectionId" - ], - "required": [ - "Type", - "CustomerGatewayId" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::EC2::VPNConnection" -} diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-fms-policy.json deleted file mode 100644 index 8422693828..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-fms-policy.json +++ /dev/null @@ -1,416 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "AccountId": { - "maxLength": 12, - "minLength": 12, - "pattern": "^([0-9]*)$", - "type": "string" - }, - "Base62Id": { - "maxLength": 22, - "minLength": 22, - "pattern": "^[a-z0-9A-Z]{22}$", - "type": "string" - }, - "FirewallDeploymentModel": { - "enum": [ - "DISTRIBUTED", - "CENTRALIZED" - ], - "type": "string" - }, - "IEMap": { - "additionalProperties": false, - "properties": { - "ACCOUNT": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/AccountId" - }, - "type": "array" - }, - "ORGUNIT": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/OrganizationalUnitId" - }, - "type": "array" - } - }, - "type": "object" - }, - "ManagedServiceData": { - "maxLength": 30000, - "minLength": 1, - "type": "string" - }, - "NetworkAclCommonPolicy": { - "additionalProperties": false, - "properties": { - "NetworkAclEntrySet": { - "$ref": "#/definitions/NetworkAclEntrySet" - } - }, - "required": [ - "NetworkAclEntrySet" - ], - "type": "object" - }, - "NetworkAclEntry": { - "additionalProperties": false, - "properties": { - "CidrBlock": { - "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$", - "type": "string" - }, - "Egress": { - "type": "boolean" - }, - "IcmpTypeCode": { - "additionalProperties": false, - "properties": { - "Code": { - "maximum": 255, - "minimum": 0, - "type": "integer" - }, - "Type": { - "maximum": 255, - "minimum": 0, - "type": "integer" - } - }, - "required": [ - "Code", - "Type" - ], - "type": "object" - }, - "Ipv6CidrBlock": { - "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$", - "type": "string" - }, - "PortRange": { - "additionalProperties": false, - "properties": { - "From": { - "maximum": 65535, - "minimum": 0, - "type": "integer" - }, - "To": { - "maximum": 65535, - "minimum": 0, - "type": "integer" - } - }, - "required": [ - "From", - "To" - ], - "type": "object" - }, - "Protocol": { - "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$", - "type": "string" - }, - "RuleAction": { - "enum": [ - "allow", - "deny" - ], - "type": "string" - } - }, - "required": [ - "Egress", - "Protocol", - "RuleAction" - ], - "type": "object" - }, - "NetworkAclEntryList": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/NetworkAclEntry" - }, - "type": "array" - }, - "NetworkAclEntrySet": { - "additionalProperties": false, - "anyOf": [ - { - "required": [ - "FirstEntries" - ] - }, - { - "required": [ - "LastEntries" - ] - } - ], - "properties": { - "FirstEntries": { - "$ref": "#/definitions/NetworkAclEntryList" - }, - "ForceRemediateForFirstEntries": { - "type": "boolean" - }, - "ForceRemediateForLastEntries": { - "type": "boolean" - }, - "LastEntries": { - "$ref": "#/definitions/NetworkAclEntryList" - } - }, - "required": [ - "ForceRemediateForFirstEntries", - "ForceRemediateForLastEntries" - ], - "type": "object" - }, - "NetworkFirewallPolicy": { - "additionalProperties": false, - "properties": { - "FirewallDeploymentModel": { - "$ref": "#/definitions/FirewallDeploymentModel" - } - }, - "required": [ - "FirewallDeploymentModel" - ], - "type": "object" - }, - "OrganizationalUnitId": { - "maxLength": 68, - "minLength": 16, - "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$", - "type": "string" - }, - "PolicyOption": { - "additionalProperties": false, - "oneOf": [ - { - "required": [ - "NetworkFirewallPolicy" - ] - }, - { - "required": [ - "ThirdPartyFirewallPolicy" - ] - }, - { - "required": [ - "NetworkAclCommonPolicy" - ] - } - ], - "properties": { - "NetworkAclCommonPolicy": { - "$ref": "#/definitions/NetworkAclCommonPolicy" - }, - "NetworkFirewallPolicy": { - "$ref": "#/definitions/NetworkFirewallPolicy" - }, - "ThirdPartyFirewallPolicy": { - "$ref": "#/definitions/ThirdPartyFirewallPolicy" - } - }, - "type": "object" - }, - "PolicyTag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^([^\\s]*)$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "pattern": "^([^\\s]*)$", - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "PolicyType": { - "enum": [ - "WAF", - "WAFV2", - "SHIELD_ADVANCED", - "SECURITY_GROUPS_COMMON", - "SECURITY_GROUPS_CONTENT_AUDIT", - "SECURITY_GROUPS_USAGE_AUDIT", - "NETWORK_FIREWALL", - "THIRD_PARTY_FIREWALL", - "DNS_FIREWALL", - "IMPORT_NETWORK_FIREWALL", - "NETWORK_ACL_COMMON" - ], - "type": "string" - }, - "ResourceArn": { - "maxLength": 1024, - "minLength": 1, - "pattern": "^([^\\s]*)$", - "type": "string" - }, - "ResourceTag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "ResourceType": { - "maxLength": 128, - "minLength": 1, - "pattern": "^([^\\s]*)$", - "type": "string" - }, - "SecurityServicePolicyData": { - "additionalProperties": false, - "properties": { - "ManagedServiceData": { - "$ref": "#/definitions/ManagedServiceData" - }, - "PolicyOption": { - "$ref": "#/definitions/PolicyOption" - }, - "Type": { - "$ref": "#/definitions/PolicyType" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "ThirdPartyFirewallPolicy": { - "additionalProperties": false, - "properties": { - "FirewallDeploymentModel": { - "$ref": "#/definitions/FirewallDeploymentModel" - } - }, - "required": [ - "FirewallDeploymentModel" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "DeleteAllPolicyResources": { - "type": "boolean" - }, - "ExcludeMap": { - "$ref": "#/definitions/IEMap" - }, - "ExcludeResourceTags": { - "type": "boolean" - }, - "Id": { - "maxLength": 36, - "minLength": 36, - "pattern": "^[a-z0-9A-Z-]{36}$", - "type": "string" - }, - "IncludeMap": { - "$ref": "#/definitions/IEMap" - }, - "PolicyDescription": { - "maxLength": 256, - "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$", - "type": "string" - }, - "PolicyName": { - "maxLength": 1024, - "minLength": 1, - "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$", - "type": "string" - }, - "RemediationEnabled": { - "type": "boolean" - }, - "ResourceSetIds": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/Base62Id" - }, - "type": "array", - "uniqueItems": true - }, - "ResourceTags": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/ResourceTag" - }, - "maxItems": 8, - "type": "array" - }, - "ResourceType": { - "$ref": "#/definitions/ResourceType" - }, - "ResourceTypeList": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/ResourceType" - }, - "type": "array" - }, - "ResourcesCleanUp": { - "type": "boolean" - }, - "SecurityServicePolicyData": { - "$ref": "#/definitions/SecurityServicePolicyData" - }, - "Tags": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PolicyTag" - }, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id" - ], - "required": [ - "ExcludeResourceTags", - "PolicyName", - "RemediationEnabled", - "SecurityServicePolicyData" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git", - "typeName": "AWS::FMS::Policy", - "writeOnlyProperties": [ - "/properties/DeleteAllPolicyResources" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-gamelift-gamesessionqueue.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-gamelift-gamesessionqueue.json new file mode 100644 index 0000000000..9bb1478d98 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-gamelift-gamesessionqueue.json @@ -0,0 +1,194 @@ +{ + "$schema": "https://schema.cloudformation.us-east-1.amazonaws.com/provider.definition.schema.v1.json", + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/Name" + ], + "definitions": { + "AllowedLocations": { + "insertionOrder": false, + "items": { + "maxLength": 64, + "minLength": 1, + "pattern": "^[A-Za-z0-9\\-]+", + "type": "string" + }, + "maxItems": 100, + "minItems": 1, + "type": "array" + }, + "FilterConfiguration": { + "additionalProperties": false, + "properties": { + "AllowedLocations": { + "$ref": "#/definitions/AllowedLocations" + } + }, + "type": "object" + }, + "GameSessionQueueDestination": { + "additionalProperties": false, + "properties": { + "DestinationArn": { + "maxLength": 256, + "minLength": 1, + "pattern": "[a-zA-Z0-9:/-]+", + "type": "string" + } + }, + "type": "object" + }, + "LocationOrder": { + "insertionOrder": true, + "items": { + "maxLength": 64, + "minLength": 1, + "pattern": "^[A-Za-z0-9\\-]+", + "type": "string" + }, + "maxItems": 100, + "minItems": 1, + "type": "array" + }, + "PlayerLatencyPolicy": { + "additionalProperties": false, + "properties": { + "MaximumIndividualPlayerLatencyMilliseconds": { + "minimum": 0, + "type": "integer" + }, + "PolicyDurationSeconds": { + "minimum": 0, + "type": "integer" + } + }, + "type": "object" + }, + "PriorityConfiguration": { + "additionalProperties": false, + "properties": { + "LocationOrder": { + "$ref": "#/definitions/LocationOrder" + }, + "PriorityOrder": { + "$ref": "#/definitions/PriorityOrder" + } + }, + "type": "object" + }, + "PriorityOrder": { + "insertionOrder": true, + "items": { + "enum": [ + "COST", + "DESTINATION", + "LATENCY", + "LOCATION" + ], + "type": "string" + }, + "maxItems": 4, + "minItems": 1, + "type": "array" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/Name" + ], + "properties": { + "Arn": { + "maxLength": 256, + "minLength": 1, + "pattern": "^arn:.*:gamesessionqueue\\/[a-zA-Z0-9-]+", + "type": "string" + }, + "CustomEventData": { + "maxLength": 256, + "minLength": 1, + "pattern": "[\\s\\S]*", + "type": "string" + }, + "Destinations": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/GameSessionQueueDestination" + }, + "type": "array" + }, + "FilterConfiguration": { + "$ref": "#/definitions/FilterConfiguration", + "type": "object" + }, + "Name": { + "maxLength": 128, + "minLength": 1, + "pattern": "[a-zA-Z0-9-]+", + "type": "string" + }, + "NotificationTarget": { + "maxLength": 300, + "minLength": 1, + "pattern": "[a-zA-Z0-9:_-]*(\\.fifo)?", + "type": "string" + }, + "PlayerLatencyPolicies": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/PlayerLatencyPolicy" + }, + "type": "array" + }, + "PriorityConfiguration": { + "$ref": "#/definitions/PriorityConfiguration", + "type": "object" + }, + "Tags": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "maxItems": 200, + "type": "array", + "uniqueItems": true + }, + "TimeoutInSeconds": { + "minimum": 0, + "type": "integer" + } + }, + "readOnlyProperties": [ + "/properties/Arn" + ], + "required": [ + "Name" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-gamelift.git", + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::GameLift::GameSessionQueue" +} diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-influxdbinstance.json deleted file mode 100644 index bfd94ca75f..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-influxdbinstance.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Username", - "/properties/Password", - "/properties/Organization", - "/properties/Bucket", - "/properties/VpcSubnetIds", - "/properties/VpcSecurityGroupIds", - "/properties/PubliclyAccessible", - "/properties/DbStorageType", - "/properties/AllocatedStorage" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "AllocatedStorage": { - "maximum": 16384, - "minimum": 20, - "type": "integer" - }, - "Arn": { - "maxLength": 1011, - "minLength": 1, - "pattern": "^arn:aws[a-z\\-]*:timestream\\-influxdb:[a-z0-9\\-]+:[0-9]{12}:(db\\-instance)/[a-zA-Z0-9]{3,64}$", - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "Bucket": { - "maxLength": 64, - "minLength": 2, - "pattern": "^[^_][^\"]*$", - "type": "string" - }, - "DbInstanceType": { - "enum": [ - "db.influx.medium", - "db.influx.large", - "db.influx.xlarge", - "db.influx.2xlarge", - "db.influx.4xlarge", - "db.influx.8xlarge", - "db.influx.12xlarge", - "db.influx.16xlarge" - ], - "type": "string" - }, - "DbParameterGroupIdentifier": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "DbStorageType": { - "enum": [ - "InfluxIOIncludedT1", - "InfluxIOIncludedT2", - "InfluxIOIncludedT3" - ], - "type": "string" - }, - "DeploymentType": { - "enum": [ - "SINGLE_AZ", - "WITH_MULTIAZ_STANDBY" - ], - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "Id": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "InfluxAuthParametersSecretArn": { - "pattern": "^arn:[a-z]*:secretsmanager:[a-z\\-0-9]*:[0-9]*:secret:[a-zA-Z0-9\\-]*", - "type": "string" - }, - "LogDeliveryConfiguration": { - "additionalProperties": false, - "properties": { - "S3Configuration": { - "additionalProperties": false, - "properties": { - "BucketName": { - "maxLength": 63, - "minLength": 3, - "pattern": "^[0-9a-z]+[0-9a-z\\.\\-]*[0-9a-z]+$", - "type": "string" - }, - "Enabled": { - "type": "boolean" - } - }, - "required": [ - "Enabled", - "BucketName" - ], - "type": "object" - } - }, - "required": [ - "S3Configuration" - ], - "type": "object" - }, - "Name": { - "maxLength": 40, - "minLength": 3, - "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", - "type": "string" - }, - "Organization": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "Password": { - "maxLength": 64, - "minLength": 8, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "Port": { - "maximum": 65535, - "minimum": 1024, - "type": "integer" - }, - "PubliclyAccessible": { - "default": false, - "type": "boolean" - }, - "SecondaryAvailabilityZone": { - "type": "string" - }, - "Status": { - "enum": [ - "CREATING", - "AVAILABLE", - "DELETING", - "MODIFYING", - "UPDATING", - "UPDATING_DEPLOYMENT_TYPE", - "UPDATING_INSTANCE_TYPE", - "DELETED", - "FAILED" - ], - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 200, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "Username": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "VpcSecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "maxItems": 5, - "minItems": 1, - "type": "array" - }, - "VpcSubnetIds": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "maxItems": 3, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Status", - "/properties/Arn", - "/properties/Id", - "/properties/AvailabilityZone", - "/properties/Endpoint", - "/properties/SecondaryAvailabilityZone", - "/properties/InfluxAuthParametersSecretArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::Timestream::InfluxDBInstance", - "writeOnlyProperties": [ - "/properties/Username", - "/properties/Password", - "/properties/Organization", - "/properties/Bucket" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py index 0d44f88b9f..c5cf5b952b 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py @@ -759,6 +759,7 @@ "Module", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-amazonmq-broker.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-acmpca-certificateauthority.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/KeyAlgorithm", - "/properties/SigningAlgorithm", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/KeyStorageSecurityStandard", - "/properties/UsageMode" - ], - "definitions": { - "AccessDescription": { - "additionalProperties": false, - "properties": { - "AccessLocation": { - "$ref": "#/definitions/GeneralName" - }, - "AccessMethod": { - "$ref": "#/definitions/AccessMethod" - } - }, - "required": [ - "AccessMethod", - "AccessLocation" - ], - "type": "object" - }, - "AccessMethod": { - "additionalProperties": false, - "properties": { - "AccessMethodType": { - "$ref": "#/definitions/AccessMethodType" - }, - "CustomObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - } - }, - "type": "object" - }, - "AccessMethodType": { - "type": "string" - }, - "Arn": { - "type": "string" - }, - "CrlConfiguration": { - "additionalProperties": false, - "properties": { - "CrlDistributionPointExtensionConfiguration": { - "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration" - }, - "CustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - }, - "Enabled": { - "type": "boolean" - }, - "ExpirationInDays": { - "type": "integer" - }, - "S3BucketName": { - "pattern": "[-a-zA-Z0-9._/]+", - "type": "string" - }, - "S3ObjectAcl": { - "enum": [ - "BUCKET_OWNER_FULL_CONTROL", - "PUBLIC_READ" - ], - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "CrlDistributionPointExtensionConfiguration": { - "additionalProperties": false, - "properties": { - "OmitExtension": { - "type": "boolean" - } - }, - "required": [ - "OmitExtension" - ], - "type": "object" - }, - "CsrExtensions": { - "additionalProperties": false, - "properties": { - "KeyUsage": { - "$ref": "#/definitions/KeyUsage" - }, - "SubjectInformationAccess": { - "$ref": "#/definitions/SubjectInformationAccess" - } - }, - "type": "object" - }, - "CustomAttribute": { - "additionalProperties": false, - "properties": { - "ObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "ObjectIdentifier", - "Value" - ], - "type": "object" - }, - "CustomAttributeList": { - "items": { - "$ref": "#/definitions/CustomAttribute" - }, - "type": "array" - }, - "CustomObjectIdentifier": { - "type": "string" - }, - "DnsName": { - "type": "string" - }, - "EdiPartyName": { - "additionalProperties": false, - "properties": { - "NameAssigner": { - "type": "string" - }, - "PartyName": { - "type": "string" - } - }, - "required": [ - "PartyName" - ], - "type": "object" - }, - "GeneralName": { - "additionalProperties": false, - "properties": { - "DirectoryName": { - "$ref": "#/definitions/Subject" - }, - "DnsName": { - "$ref": "#/definitions/DnsName" - }, - "EdiPartyName": { - "$ref": "#/definitions/EdiPartyName" - }, - "IpAddress": { - "$ref": "#/definitions/IpAddress" - }, - "OtherName": { - "$ref": "#/definitions/OtherName" - }, - "RegisteredId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Rfc822Name": { - "$ref": "#/definitions/Rfc822Name" - }, - "UniformResourceIdentifier": { - "$ref": "#/definitions/UniformResourceIdentifier" - } - }, - "type": "object" - }, - "IpAddress": { - "type": "string" - }, - "KeyUsage": { - "additionalProperties": false, - "properties": { - "CRLSign": { - "default": false, - "type": "boolean" - }, - "DataEncipherment": { - "default": false, - "type": "boolean" - }, - "DecipherOnly": { - "default": false, - "type": "boolean" - }, - "DigitalSignature": { - "default": false, - "type": "boolean" - }, - "EncipherOnly": { - "default": false, - "type": "boolean" - }, - "KeyAgreement": { - "default": false, - "type": "boolean" - }, - "KeyCertSign": { - "default": false, - "type": "boolean" - }, - "KeyEncipherment": { - "default": false, - "type": "boolean" - }, - "NonRepudiation": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "OcspConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "type": "boolean" - }, - "OcspCustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "OtherName": { - "additionalProperties": false, - "properties": { - "TypeId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "TypeId", - "Value" - ], - "type": "object" - }, - "RevocationConfiguration": { - "additionalProperties": false, - "properties": { - "CrlConfiguration": { - "$ref": "#/definitions/CrlConfiguration" - }, - "OcspConfiguration": { - "$ref": "#/definitions/OcspConfiguration" - } - }, - "type": "object" - }, - "Rfc822Name": { - "type": "string" - }, - "Subject": { - "additionalProperties": false, - "properties": { - "CommonName": { - "type": "string" - }, - "Country": { - "type": "string" - }, - "CustomAttributes": { - "$ref": "#/definitions/CustomAttributeList" - }, - "DistinguishedNameQualifier": { - "type": "string" - }, - "GenerationQualifier": { - "type": "string" - }, - "GivenName": { - "type": "string" - }, - "Initials": { - "type": "string" - }, - "Locality": { - "type": "string" - }, - "Organization": { - "type": "string" - }, - "OrganizationalUnit": { - "type": "string" - }, - "Pseudonym": { - "type": "string" - }, - "SerialNumber": { - "type": "string" - }, - "State": { - "type": "string" - }, - "Surname": { - "type": "string" - }, - "Title": { - "type": "string" - } - }, - "type": "object" - }, - "SubjectInformationAccess": { - "items": { - "$ref": "#/definitions/AccessDescription" - }, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - }, - "Value": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "UniformResourceIdentifier": { - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "CertificateSigningRequest": { - "type": "string" - }, - "CsrExtensions": { - "$ref": "#/definitions/CsrExtensions" - }, - "KeyAlgorithm": { - "type": "string" - }, - "KeyStorageSecurityStandard": { - "enum": [ - "CCPC_LEVEL_1_OR_HIGHER", - "FIPS_140_2_LEVEL_2_OR_HIGHER", - "FIPS_140_2_LEVEL_3_OR_HIGHER" - ], - "type": "string" - }, - "RevocationConfiguration": { - "$ref": "#/definitions/RevocationConfiguration" - }, - "SigningAlgorithm": { - "type": "string" - }, - "Subject": { - "$ref": "#/definitions/Subject" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - }, - "Type": { - "type": "string" - }, - "UsageMode": { - "enum": [ - "GENERAL_PURPOSE", - "SHORT_LIVED_CERTIFICATE" - ], - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CertificateSigningRequest" - ], - "required": [ - "Type", - "KeyAlgorithm", - "SigningAlgorithm", - "Subject" - ], - "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ACMPCA::CertificateAuthority", - "writeOnlyProperties": [ - "/properties/Subject", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/Tags", - "/properties/RevocationConfiguration", - "/properties/KeyStorageSecurityStandard" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py index aaf9b28753..e58ca190b5 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py @@ -306,6 +306,7 @@ "AWS::Route53::HostedZone", "AWS::Route53::RecordSet", "AWS::Route53::RecordSetGroup", + "AWS::Route53Resolver::ResolverConfig", "AWS::Route53Resolver::ResolverEndpoint", "AWS::Route53Resolver::ResolverRule", "AWS::Route53Resolver::ResolverRuleAssociation", @@ -599,7 +600,10 @@ "aws-rolesanywhere-trustanchor.json", "aws-route53-recordset.json", "aws-route53-recordsetgroup.json", + "aws-route53resolver-resolverconfig.json", "aws-route53resolver-resolverendpoint.json", + "aws-route53resolver-resolverrule.json", + "aws-route53resolver-resolverruleassociation.json", "aws-s3-accesspoint.json", "aws-s3-bucketpolicy.json", "aws-s3objectlambda-accesspoint.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-route53resolver-resolverrule.json b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-route53resolver-resolverrule.json deleted file mode 100644 index 2e9bf86414..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-route53resolver-resolverrule.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/RuleType", - "/properties/DomainName" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "type": "string" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "TargetAddress": { - "additionalProperties": false, - "properties": { - "Ip": { - "type": "string" - }, - "Ipv6": { - "type": "string" - }, - "Port": { - "type": "string" - }, - "Protocol": { - "type": "string" - }, - "ServerNameIndication": { - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ResolverRuleId" - ], - "properties": { - "Arn": { - "type": "string" - }, - "DomainName": { - "type": "string" - }, - "Name": { - "pattern": "(?!^[0-9]+$)([a-zA-Z0-9\\-_' ']+)", - "type": "string" - }, - "ResolverEndpointId": { - "type": "string" - }, - "ResolverRuleId": { - "type": "string" - }, - "RuleType": { - "type": "string" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array", - "uniqueItems": false - }, - "TargetIps": { - "items": { - "$ref": "#/definitions/TargetAddress" - }, - "type": "array", - "uniqueItems": false - } - }, - "readOnlyProperties": [ - "/properties/ResolverRuleId", - "/properties/Arn" - ], - "required": [ - "DomainName", - "RuleType" - ], - "typeName": "AWS::Route53Resolver::ResolverRule" -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-route53resolver-resolverruleassociation.json b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-route53resolver-resolverruleassociation.json deleted file mode 100644 index 48e0f6bdfd..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-route53resolver-resolverruleassociation.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/VPCId", - "/properties/ResolverRuleId" - ], - "primaryIdentifier": [ - "/properties/ResolverRuleAssociationId" - ], - "properties": { - "Name": { - "type": "string" - }, - "ResolverRuleAssociationId": { - "type": "string" - }, - "ResolverRuleId": { - "type": "string" - }, - "VPCId": { - "format": "AWS::EC2::VPC.Id", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/ResolverRuleAssociationId" - ], - "required": [ - "VPCId", - "ResolverRuleId" - ], - "typeName": "AWS::Route53Resolver::ResolverRuleAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py index b15984afa3..9fd993e51e 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py @@ -612,6 +612,7 @@ "Module", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-amazonmq-broker.json", diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-acmpca-certificateauthority.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/KeyAlgorithm", - "/properties/SigningAlgorithm", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/KeyStorageSecurityStandard", - "/properties/UsageMode" - ], - "definitions": { - "AccessDescription": { - "additionalProperties": false, - "properties": { - "AccessLocation": { - "$ref": "#/definitions/GeneralName" - }, - "AccessMethod": { - "$ref": "#/definitions/AccessMethod" - } - }, - "required": [ - "AccessMethod", - "AccessLocation" - ], - "type": "object" - }, - "AccessMethod": { - "additionalProperties": false, - "properties": { - "AccessMethodType": { - "$ref": "#/definitions/AccessMethodType" - }, - "CustomObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - } - }, - "type": "object" - }, - "AccessMethodType": { - "type": "string" - }, - "Arn": { - "type": "string" - }, - "CrlConfiguration": { - "additionalProperties": false, - "properties": { - "CrlDistributionPointExtensionConfiguration": { - "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration" - }, - "CustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - }, - "Enabled": { - "type": "boolean" - }, - "ExpirationInDays": { - "type": "integer" - }, - "S3BucketName": { - "pattern": "[-a-zA-Z0-9._/]+", - "type": "string" - }, - "S3ObjectAcl": { - "enum": [ - "BUCKET_OWNER_FULL_CONTROL", - "PUBLIC_READ" - ], - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "CrlDistributionPointExtensionConfiguration": { - "additionalProperties": false, - "properties": { - "OmitExtension": { - "type": "boolean" - } - }, - "required": [ - "OmitExtension" - ], - "type": "object" - }, - "CsrExtensions": { - "additionalProperties": false, - "properties": { - "KeyUsage": { - "$ref": "#/definitions/KeyUsage" - }, - "SubjectInformationAccess": { - "$ref": "#/definitions/SubjectInformationAccess" - } - }, - "type": "object" - }, - "CustomAttribute": { - "additionalProperties": false, - "properties": { - "ObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "ObjectIdentifier", - "Value" - ], - "type": "object" - }, - "CustomAttributeList": { - "items": { - "$ref": "#/definitions/CustomAttribute" - }, - "type": "array" - }, - "CustomObjectIdentifier": { - "type": "string" - }, - "DnsName": { - "type": "string" - }, - "EdiPartyName": { - "additionalProperties": false, - "properties": { - "NameAssigner": { - "type": "string" - }, - "PartyName": { - "type": "string" - } - }, - "required": [ - "PartyName" - ], - "type": "object" - }, - "GeneralName": { - "additionalProperties": false, - "properties": { - "DirectoryName": { - "$ref": "#/definitions/Subject" - }, - "DnsName": { - "$ref": "#/definitions/DnsName" - }, - "EdiPartyName": { - "$ref": "#/definitions/EdiPartyName" - }, - "IpAddress": { - "$ref": "#/definitions/IpAddress" - }, - "OtherName": { - "$ref": "#/definitions/OtherName" - }, - "RegisteredId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Rfc822Name": { - "$ref": "#/definitions/Rfc822Name" - }, - "UniformResourceIdentifier": { - "$ref": "#/definitions/UniformResourceIdentifier" - } - }, - "type": "object" - }, - "IpAddress": { - "type": "string" - }, - "KeyUsage": { - "additionalProperties": false, - "properties": { - "CRLSign": { - "default": false, - "type": "boolean" - }, - "DataEncipherment": { - "default": false, - "type": "boolean" - }, - "DecipherOnly": { - "default": false, - "type": "boolean" - }, - "DigitalSignature": { - "default": false, - "type": "boolean" - }, - "EncipherOnly": { - "default": false, - "type": "boolean" - }, - "KeyAgreement": { - "default": false, - "type": "boolean" - }, - "KeyCertSign": { - "default": false, - "type": "boolean" - }, - "KeyEncipherment": { - "default": false, - "type": "boolean" - }, - "NonRepudiation": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "OcspConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "type": "boolean" - }, - "OcspCustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "OtherName": { - "additionalProperties": false, - "properties": { - "TypeId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "TypeId", - "Value" - ], - "type": "object" - }, - "RevocationConfiguration": { - "additionalProperties": false, - "properties": { - "CrlConfiguration": { - "$ref": "#/definitions/CrlConfiguration" - }, - "OcspConfiguration": { - "$ref": "#/definitions/OcspConfiguration" - } - }, - "type": "object" - }, - "Rfc822Name": { - "type": "string" - }, - "Subject": { - "additionalProperties": false, - "properties": { - "CommonName": { - "type": "string" - }, - "Country": { - "type": "string" - }, - "CustomAttributes": { - "$ref": "#/definitions/CustomAttributeList" - }, - "DistinguishedNameQualifier": { - "type": "string" - }, - "GenerationQualifier": { - "type": "string" - }, - "GivenName": { - "type": "string" - }, - "Initials": { - "type": "string" - }, - "Locality": { - "type": "string" - }, - "Organization": { - "type": "string" - }, - "OrganizationalUnit": { - "type": "string" - }, - "Pseudonym": { - "type": "string" - }, - "SerialNumber": { - "type": "string" - }, - "State": { - "type": "string" - }, - "Surname": { - "type": "string" - }, - "Title": { - "type": "string" - } - }, - "type": "object" - }, - "SubjectInformationAccess": { - "items": { - "$ref": "#/definitions/AccessDescription" - }, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - }, - "Value": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "UniformResourceIdentifier": { - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "CertificateSigningRequest": { - "type": "string" - }, - "CsrExtensions": { - "$ref": "#/definitions/CsrExtensions" - }, - "KeyAlgorithm": { - "type": "string" - }, - "KeyStorageSecurityStandard": { - "enum": [ - "CCPC_LEVEL_1_OR_HIGHER", - "FIPS_140_2_LEVEL_2_OR_HIGHER", - "FIPS_140_2_LEVEL_3_OR_HIGHER" - ], - "type": "string" - }, - "RevocationConfiguration": { - "$ref": "#/definitions/RevocationConfiguration" - }, - "SigningAlgorithm": { - "type": "string" - }, - "Subject": { - "$ref": "#/definitions/Subject" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - }, - "Type": { - "type": "string" - }, - "UsageMode": { - "enum": [ - "GENERAL_PURPOSE", - "SHORT_LIVED_CERTIFICATE" - ], - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CertificateSigningRequest" - ], - "required": [ - "Type", - "KeyAlgorithm", - "SigningAlgorithm", - "Subject" - ], - "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ACMPCA::CertificateAuthority", - "writeOnlyProperties": [ - "/properties/Subject", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/Tags", - "/properties/RevocationConfiguration", - "/properties/KeyStorageSecurityStandard" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py index bcdf08e47f..433f6b1f5d 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py @@ -206,6 +206,7 @@ "AWS::CloudFront::RealtimeLogConfig", "AWS::CloudFront::ResponseHeadersPolicy", "AWS::CloudFront::StreamingDistribution", + "AWS::CloudFront::VpcOrigin", "AWS::CloudTrail::Channel", "AWS::CloudTrail::Dashboard", "AWS::CloudTrail::EventDataStore", @@ -2128,6 +2129,7 @@ "aws-mediaconnect-bridge.json", "aws-mediaconnect-bridgeoutput.json", "aws-mediaconnect-bridgesource.json", + "aws-mediaconnect-flow.json", "aws-mediaconnect-flowentitlement.json", "aws-mediaconnect-flowoutput.json", "aws-mediaconnect-flowsource.json", diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudfront-vpcorigin.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudfront-vpcorigin.json new file mode 100644 index 0000000000..80909b40c9 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudfront-vpcorigin.json @@ -0,0 +1,108 @@ +{ + "additionalProperties": false, + "definitions": { + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "type": "string" + }, + "Value": { + "type": "string" + } + }, + "required": [ + "Value", + "Key" + ], + "type": "object" + }, + "VpcOriginEndpointConfig": { + "additionalProperties": false, + "properties": { + "Arn": { + "type": "string" + }, + "HTTPPort": { + "default": 80, + "type": "integer" + }, + "HTTPSPort": { + "default": 443, + "type": "integer" + }, + "Name": { + "type": "string" + }, + "OriginProtocolPolicy": { + "default": "match-viewer", + "type": "string" + }, + "OriginSSLProtocols": { + "default": [ + "TLSv1", + "SSLv3" + ], + "items": { + "type": "string" + }, + "type": "array", + "uniqueItems": false + } + }, + "required": [ + "Name", + "Arn" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/Id" + ], + "properties": { + "Arn": { + "type": "string" + }, + "CreatedTime": { + "type": "string" + }, + "Id": { + "type": "string" + }, + "LastModifiedTime": { + "type": "string" + }, + "Status": { + "type": "string" + }, + "Tags": { + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": false + }, + "VpcOriginEndpointConfig": { + "$ref": "#/definitions/VpcOriginEndpointConfig" + } + }, + "readOnlyProperties": [ + "/properties/Id", + "/properties/Arn", + "/properties/Status", + "/properties/CreatedTime", + "/properties/LastModifiedTime" + ], + "required": [ + "VpcOriginEndpointConfig" + ], + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::CloudFront::VpcOrigin" +} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-mediaconnect-flow.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-mediaconnect-flow.json deleted file mode 100644 index 107cc06e52..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-mediaconnect-flow.json +++ /dev/null @@ -1,524 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/AvailabilityZone", - "/properties/Source/Name" - ], - "definitions": { - "Encryption": { - "additionalProperties": false, - "properties": { - "Algorithm": { - "enum": [ - "aes128", - "aes192", - "aes256" - ], - "type": "string" - }, - "ConstantInitializationVector": { - "type": "string" - }, - "DeviceId": { - "type": "string" - }, - "KeyType": { - "default": "static-key", - "enum": [ - "speke", - "static-key", - "srt-password" - ], - "type": "string" - }, - "Region": { - "type": "string" - }, - "ResourceId": { - "type": "string" - }, - "RoleArn": { - "type": "string" - }, - "SecretArn": { - "type": "string" - }, - "Url": { - "type": "string" - } - }, - "required": [ - "RoleArn" - ], - "type": "object" - }, - "FailoverConfig": { - "additionalProperties": false, - "properties": { - "FailoverMode": { - "enum": [ - "MERGE", - "FAILOVER" - ], - "type": "string" - }, - "RecoveryWindow": { - "type": "integer" - }, - "SourcePriority": { - "additionalProperties": false, - "properties": { - "PrimarySource": { - "type": "string" - } - }, - "required": [ - "PrimarySource" - ], - "type": "object" - }, - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - } - }, - "type": "object" - }, - "Fmtp": { - "additionalProperties": false, - "properties": { - "ChannelOrder": { - "type": "string" - }, - "Colorimetry": { - "enum": [ - "BT601", - "BT709", - "BT2020", - "BT2100", - "ST2065-1", - "ST2065-3", - "XYZ" - ], - "type": "string" - }, - "ExactFramerate": { - "type": "string" - }, - "Par": { - "type": "string" - }, - "Range": { - "enum": [ - "NARROW", - "FULL", - "FULLPROTECT" - ], - "type": "string" - }, - "ScanMode": { - "enum": [ - "progressive", - "interlace", - "progressive-segmented-frame" - ], - "type": "string" - }, - "Tcs": { - "enum": [ - "SDR", - "PQ", - "HLG", - "LINEAR", - "BT2100LINPQ", - "BT2100LINHLG", - "ST2065-1", - "ST428-1", - "DENSITY" - ], - "type": "string" - } - }, - "type": "object" - }, - "GatewayBridgeSource": { - "additionalProperties": false, - "properties": { - "BridgeArn": { - "type": "string" - }, - "VpcInterfaceAttachment": { - "$ref": "#/definitions/VpcInterfaceAttachment" - } - }, - "required": [ - "BridgeArn" - ], - "type": "object" - }, - "InputConfiguration": { - "additionalProperties": false, - "properties": { - "InputPort": { - "type": "integer" - }, - "Interface": { - "$ref": "#/definitions/Interface" - } - }, - "required": [ - "InputPort", - "Interface" - ], - "type": "object" - }, - "Interface": { - "additionalProperties": false, - "properties": { - "Name": { - "type": "string" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "Maintenance": { - "additionalProperties": false, - "properties": { - "MaintenanceDay": { - "enum": [ - "Monday", - "Tuesday", - "Wednesday", - "Thursday", - "Friday", - "Saturday", - "Sunday" - ], - "type": "string" - }, - "MaintenanceStartHour": { - "type": "string" - } - }, - "required": [ - "MaintenanceDay", - "MaintenanceStartHour" - ], - "type": "object" - }, - "MediaStream": { - "additionalProperties": false, - "properties": { - "Attributes": { - "$ref": "#/definitions/MediaStreamAttributes" - }, - "ClockRate": { - "type": "integer" - }, - "Description": { - "type": "string" - }, - "Fmt": { - "type": "integer" - }, - "MediaStreamId": { - "type": "integer" - }, - "MediaStreamName": { - "type": "string" - }, - "MediaStreamType": { - "enum": [ - "video", - "audio", - "ancillary-data" - ], - "type": "string" - }, - "VideoFormat": { - "enum": [ - "2160p", - "1080p", - "1080i", - "720p", - "480p" - ], - "type": "string" - } - }, - "required": [ - "MediaStreamId", - "MediaStreamType", - "MediaStreamName" - ], - "type": "object" - }, - "MediaStreamAttributes": { - "additionalProperties": false, - "properties": { - "Fmtp": { - "$ref": "#/definitions/Fmtp" - }, - "Lang": { - "type": "string" - } - }, - "type": "object" - }, - "MediaStreamSourceConfiguration": { - "additionalProperties": false, - "properties": { - "EncodingName": { - "enum": [ - "jxsv", - "raw", - "smpte291", - "pcm" - ], - "type": "string" - }, - "InputConfigurations": { - "items": { - "$ref": "#/definitions/InputConfiguration" - }, - "type": "array" - }, - "MediaStreamName": { - "type": "string" - } - }, - "required": [ - "EncodingName", - "MediaStreamName" - ], - "type": "object" - }, - "Source": { - "additionalProperties": false, - "properties": { - "Decryption": { - "$ref": "#/definitions/Encryption" - }, - "Description": { - "type": "string" - }, - "EntitlementArn": { - "type": "string" - }, - "GatewayBridgeSource": { - "$ref": "#/definitions/GatewayBridgeSource" - }, - "IngestIp": { - "type": "string" - }, - "IngestPort": { - "type": "integer" - }, - "MaxBitrate": { - "type": "integer" - }, - "MaxLatency": { - "type": "integer" - }, - "MaxSyncBuffer": { - "type": "integer" - }, - "MediaStreamSourceConfigurations": { - "items": { - "$ref": "#/definitions/MediaStreamSourceConfiguration" - }, - "type": "array" - }, - "MinLatency": { - "type": "integer" - }, - "Name": { - "type": "string" - }, - "Protocol": { - "enum": [ - "zixi-push", - "rtp-fec", - "rtp", - "rist", - "fujitsu-qos", - "srt-listener", - "srt-caller", - "st2110-jpegxs", - "cdi" - ], - "type": "string" - }, - "SenderControlPort": { - "type": "integer" - }, - "SenderIpAddress": { - "type": "string" - }, - "SourceArn": { - "type": "string" - }, - "SourceIngestPort": { - "type": "string" - }, - "SourceListenerAddress": { - "type": "string" - }, - "SourceListenerPort": { - "type": "integer" - }, - "StreamId": { - "type": "string" - }, - "VpcInterfaceName": { - "type": "string" - }, - "WhitelistCidr": { - "type": "string" - } - }, - "type": "object" - }, - "SourceMonitoringConfig": { - "additionalProperties": false, - "properties": { - "ThumbnailState": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - } - }, - "required": [ - "ThumbnailState" - ], - "type": "object" - }, - "VpcInterface": { - "additionalProperties": false, - "properties": { - "Name": { - "type": "string" - }, - "NetworkInterfaceIds": { - "items": { - "type": "string" - }, - "type": "array" - }, - "NetworkInterfaceType": { - "enum": [ - "ena", - "efa" - ], - "type": "string" - }, - "RoleArn": { - "type": "string" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "type": "array" - }, - "SubnetId": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - } - }, - "required": [ - "Name", - "RoleArn", - "SecurityGroupIds", - "SubnetId" - ], - "type": "object" - }, - "VpcInterfaceAttachment": { - "additionalProperties": false, - "properties": { - "VpcInterfaceName": { - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/FlowArn" - ], - "properties": { - "AvailabilityZone": { - "type": "string" - }, - "EgressIp": { - "type": "string" - }, - "FlowArn": { - "type": "string" - }, - "FlowAvailabilityZone": { - "type": "string" - }, - "Maintenance": { - "$ref": "#/definitions/Maintenance" - }, - "MediaStreams": { - "items": { - "$ref": "#/definitions/MediaStream" - }, - "type": "array" - }, - "Name": { - "type": "string" - }, - "Source": { - "$ref": "#/definitions/Source" - }, - "SourceFailoverConfig": { - "$ref": "#/definitions/FailoverConfig" - }, - "SourceMonitoringConfig": { - "$ref": "#/definitions/SourceMonitoringConfig" - }, - "VpcInterfaces": { - "items": { - "$ref": "#/definitions/VpcInterface" - }, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/FlowArn", - "/properties/FlowAvailabilityZone", - "/properties/Source/SourceArn", - "/properties/Source/IngestIp", - "/properties/Source/SourceIngestPort", - "/properties/VpcInterfaces/*/NetworkInterfaceIds", - "/properties/MediaStreams/*/Fmt", - "/properties/EgressIp" - ], - "required": [ - "Name", - "Source" - ], - "resourceLink": { - "mappings": { - "flowArn": "/FlowArn" - }, - "templateUri": "/mediaconnect/home?region=${awsRegion}#/flows/${flowArn}" - }, - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-mediaconnect.git", - "typeName": "AWS::MediaConnect::Flow" -} diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py index 5e053823e1..afc64e2de7 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py @@ -616,6 +616,7 @@ "AWS::Logs::DeliveryDestination", "AWS::Logs::DeliverySource", "AWS::Logs::Destination", + "AWS::Logs::Integration", "AWS::Logs::LogAnomalyDetector", "AWS::Logs::LogGroup", "AWS::Logs::LogStream", @@ -1037,6 +1038,7 @@ "Module", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-amazonmq-broker.json", @@ -1200,6 +1202,7 @@ "aws-cloudwatch-compositealarm.json", "aws-cloudwatch-dashboard.json", "aws-cloudwatch-insightrule.json", + "aws-cloudwatch-metricstream.json", "aws-codeartifact-domain.json", "aws-codeartifact-packagegroup.json", "aws-codeartifact-repository.json", @@ -1301,6 +1304,7 @@ "aws-dms-replicationtask.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", + "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnauthorizationrule.json", "aws-ec2-clientvpnendpoint.json", @@ -1626,6 +1630,7 @@ "aws-logs-deliverydestination.json", "aws-logs-deliverysource.json", "aws-logs-destination.json", + "aws-logs-integration.json", "aws-logs-loganomalydetector.json", "aws-logs-loggroup.json", "aws-logs-logstream.json", @@ -1957,6 +1962,7 @@ "aws-ssmcontacts-contactchannel.json", "aws-ssmcontacts-plan.json", "aws-ssmcontacts-rotation.json", + "aws-ssmincidents-replicationset.json", "aws-ssmincidents-responseplan.json", "aws-ssmquicksetup-configurationmanager.json", "aws-sso-application.json", diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-acmpca-certificateauthority.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/KeyAlgorithm", - "/properties/SigningAlgorithm", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/KeyStorageSecurityStandard", - "/properties/UsageMode" - ], - "definitions": { - "AccessDescription": { - "additionalProperties": false, - "properties": { - "AccessLocation": { - "$ref": "#/definitions/GeneralName" - }, - "AccessMethod": { - "$ref": "#/definitions/AccessMethod" - } - }, - "required": [ - "AccessMethod", - "AccessLocation" - ], - "type": "object" - }, - "AccessMethod": { - "additionalProperties": false, - "properties": { - "AccessMethodType": { - "$ref": "#/definitions/AccessMethodType" - }, - "CustomObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - } - }, - "type": "object" - }, - "AccessMethodType": { - "type": "string" - }, - "Arn": { - "type": "string" - }, - "CrlConfiguration": { - "additionalProperties": false, - "properties": { - "CrlDistributionPointExtensionConfiguration": { - "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration" - }, - "CustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - }, - "Enabled": { - "type": "boolean" - }, - "ExpirationInDays": { - "type": "integer" - }, - "S3BucketName": { - "pattern": "[-a-zA-Z0-9._/]+", - "type": "string" - }, - "S3ObjectAcl": { - "enum": [ - "BUCKET_OWNER_FULL_CONTROL", - "PUBLIC_READ" - ], - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "CrlDistributionPointExtensionConfiguration": { - "additionalProperties": false, - "properties": { - "OmitExtension": { - "type": "boolean" - } - }, - "required": [ - "OmitExtension" - ], - "type": "object" - }, - "CsrExtensions": { - "additionalProperties": false, - "properties": { - "KeyUsage": { - "$ref": "#/definitions/KeyUsage" - }, - "SubjectInformationAccess": { - "$ref": "#/definitions/SubjectInformationAccess" - } - }, - "type": "object" - }, - "CustomAttribute": { - "additionalProperties": false, - "properties": { - "ObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "ObjectIdentifier", - "Value" - ], - "type": "object" - }, - "CustomAttributeList": { - "items": { - "$ref": "#/definitions/CustomAttribute" - }, - "type": "array" - }, - "CustomObjectIdentifier": { - "type": "string" - }, - "DnsName": { - "type": "string" - }, - "EdiPartyName": { - "additionalProperties": false, - "properties": { - "NameAssigner": { - "type": "string" - }, - "PartyName": { - "type": "string" - } - }, - "required": [ - "PartyName" - ], - "type": "object" - }, - "GeneralName": { - "additionalProperties": false, - "properties": { - "DirectoryName": { - "$ref": "#/definitions/Subject" - }, - "DnsName": { - "$ref": "#/definitions/DnsName" - }, - "EdiPartyName": { - "$ref": "#/definitions/EdiPartyName" - }, - "IpAddress": { - "$ref": "#/definitions/IpAddress" - }, - "OtherName": { - "$ref": "#/definitions/OtherName" - }, - "RegisteredId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Rfc822Name": { - "$ref": "#/definitions/Rfc822Name" - }, - "UniformResourceIdentifier": { - "$ref": "#/definitions/UniformResourceIdentifier" - } - }, - "type": "object" - }, - "IpAddress": { - "type": "string" - }, - "KeyUsage": { - "additionalProperties": false, - "properties": { - "CRLSign": { - "default": false, - "type": "boolean" - }, - "DataEncipherment": { - "default": false, - "type": "boolean" - }, - "DecipherOnly": { - "default": false, - "type": "boolean" - }, - "DigitalSignature": { - "default": false, - "type": "boolean" - }, - "EncipherOnly": { - "default": false, - "type": "boolean" - }, - "KeyAgreement": { - "default": false, - "type": "boolean" - }, - "KeyCertSign": { - "default": false, - "type": "boolean" - }, - "KeyEncipherment": { - "default": false, - "type": "boolean" - }, - "NonRepudiation": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "OcspConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "type": "boolean" - }, - "OcspCustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "OtherName": { - "additionalProperties": false, - "properties": { - "TypeId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "TypeId", - "Value" - ], - "type": "object" - }, - "RevocationConfiguration": { - "additionalProperties": false, - "properties": { - "CrlConfiguration": { - "$ref": "#/definitions/CrlConfiguration" - }, - "OcspConfiguration": { - "$ref": "#/definitions/OcspConfiguration" - } - }, - "type": "object" - }, - "Rfc822Name": { - "type": "string" - }, - "Subject": { - "additionalProperties": false, - "properties": { - "CommonName": { - "type": "string" - }, - "Country": { - "type": "string" - }, - "CustomAttributes": { - "$ref": "#/definitions/CustomAttributeList" - }, - "DistinguishedNameQualifier": { - "type": "string" - }, - "GenerationQualifier": { - "type": "string" - }, - "GivenName": { - "type": "string" - }, - "Initials": { - "type": "string" - }, - "Locality": { - "type": "string" - }, - "Organization": { - "type": "string" - }, - "OrganizationalUnit": { - "type": "string" - }, - "Pseudonym": { - "type": "string" - }, - "SerialNumber": { - "type": "string" - }, - "State": { - "type": "string" - }, - "Surname": { - "type": "string" - }, - "Title": { - "type": "string" - } - }, - "type": "object" - }, - "SubjectInformationAccess": { - "items": { - "$ref": "#/definitions/AccessDescription" - }, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - }, - "Value": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "UniformResourceIdentifier": { - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "CertificateSigningRequest": { - "type": "string" - }, - "CsrExtensions": { - "$ref": "#/definitions/CsrExtensions" - }, - "KeyAlgorithm": { - "type": "string" - }, - "KeyStorageSecurityStandard": { - "enum": [ - "CCPC_LEVEL_1_OR_HIGHER", - "FIPS_140_2_LEVEL_2_OR_HIGHER", - "FIPS_140_2_LEVEL_3_OR_HIGHER" - ], - "type": "string" - }, - "RevocationConfiguration": { - "$ref": "#/definitions/RevocationConfiguration" - }, - "SigningAlgorithm": { - "type": "string" - }, - "Subject": { - "$ref": "#/definitions/Subject" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - }, - "Type": { - "type": "string" - }, - "UsageMode": { - "enum": [ - "GENERAL_PURPOSE", - "SHORT_LIVED_CERTIFICATE" - ], - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CertificateSigningRequest" - ], - "required": [ - "Type", - "KeyAlgorithm", - "SigningAlgorithm", - "Subject" - ], - "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ACMPCA::CertificateAuthority", - "writeOnlyProperties": [ - "/properties/Subject", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/Tags", - "/properties/RevocationConfiguration", - "/properties/KeyStorageSecurityStandard" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-cloudwatch-metricstream.json deleted file mode 100644 index 89ca2654d5..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-cloudwatch-metricstream.json +++ /dev/null @@ -1,228 +0,0 @@ -{ - "additionalProperties": false, - "allOf": [ - { - "required": [ - "FirehoseArn", - "RoleArn", - "OutputFormat" - ] - }, - { - "oneOf": [ - {}, - { - "required": [ - "IncludeFilters", - "ExcludeFilters" - ] - } - ] - } - ], - "createOnlyProperties": [ - "/properties/Name" - ], - "definitions": { - "MetricStreamFilter": { - "additionalProperties": false, - "properties": { - "MetricNames": { - "items": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "maxItems": 999, - "type": "array" - }, - "Namespace": { - "maxLength": 255, - "minLength": 1, - "pattern": "[^:].*", - "type": "string" - } - }, - "required": [ - "Namespace" - ], - "type": "object" - }, - "MetricStreamStatisticsConfiguration": { - "additionalProperties": false, - "properties": { - "AdditionalStatistics": { - "items": { - "type": "string" - }, - "maxItems": 20, - "type": "array", - "uniqueItems": true - }, - "IncludeMetrics": { - "items": { - "$ref": "#/definitions/MetricStreamStatisticsMetric" - }, - "maxItems": 100, - "type": "array", - "uniqueItems": true - } - }, - "required": [ - "AdditionalStatistics", - "IncludeMetrics" - ], - "type": "object" - }, - "MetricStreamStatisticsMetric": { - "additionalProperties": false, - "properties": { - "MetricName": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "Namespace": { - "maxLength": 255, - "minLength": 1, - "pattern": "[^:].*", - "type": "string" - } - }, - "required": [ - "MetricName", - "Namespace" - ], - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "CreationDate": { - "anyOf": [ - { - "format": "date-time" - }, - { - "format": "timestamp" - } - ], - "type": "string" - }, - "ExcludeFilters": { - "items": { - "$ref": "#/definitions/MetricStreamFilter" - }, - "maxItems": 1000, - "type": "array", - "uniqueItems": true - }, - "FirehoseArn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "IncludeFilters": { - "items": { - "$ref": "#/definitions/MetricStreamFilter" - }, - "maxItems": 1000, - "type": "array", - "uniqueItems": true - }, - "IncludeLinkedAccountsMetrics": { - "type": "boolean" - }, - "LastUpdateDate": { - "anyOf": [ - { - "format": "date-time" - }, - { - "format": "timestamp" - } - ], - "type": "string" - }, - "Name": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "OutputFormat": { - "enum": [ - "json", - "opentelemetry0.7", - "opentelemetry1.0" - ], - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "RoleArn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "State": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "StatisticsConfigurations": { - "items": { - "$ref": "#/definitions/MetricStreamStatisticsConfiguration" - }, - "maxItems": 100, - "type": "array", - "uniqueItems": true - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreationDate", - "/properties/LastUpdateDate", - "/properties/State" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git", - "taggable": true, - "typeName": "AWS::CloudWatch::MetricStream", - "writeOnlyProperties": [ - "/properties/Tags" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-capacityreservation.json deleted file mode 100644 index 5a10969ce5..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-capacityreservation.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Tenancy", - "/properties/InstancePlatform", - "/properties/InstanceType", - "/properties/AvailabilityZone", - "/properties/TagSpecifications", - "/properties/OutPostArn", - "/properties/EphemeralStorage", - "/properties/EbsOptimized", - "/properties/PlacementGroupArn" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "type": "string" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "TagSpecification": { - "additionalProperties": false, - "properties": { - "ResourceType": { - "enum": [ - "capacity-reservation", - "capacity-reservation-fleet", - "carrier-gateway", - "client-vpn-endpoint", - "coip-pool", - "customer-gateway", - "declarative-policies-report", - "dedicated-host", - "dhcp-options", - "egress-only-internet-gateway", - "elastic-gpu", - "elastic-ip", - "export-image-task", - "export-instance-task", - "fleet", - "fpga-image", - "host-reservation", - "image", - "import-image-task", - "import-snapshot-task", - "instance", - "instance-connect-endpoint", - "instance-event-window", - "internet-gateway", - "ipam", - "ipam-external-resource-verification-token", - "ipam-pool", - "ipam-resource-discovery", - "ipam-resource-discovery-association", - "ipam-scope", - "ipv4pool-ec2", - "ipv6pool-ec2", - "key-pair", - "launch-template", - "local-gateway", - "local-gateway-route-table", - "local-gateway-route-table-virtual-interface-group-association", - "local-gateway-route-table-vpc-association", - "local-gateway-virtual-interface", - "local-gateway-virtual-interface-group", - "natgateway", - "network-acl", - "network-insights-access-scope", - "network-insights-access-scope-analysis", - "network-insights-analysis", - "network-insights-path", - "network-interface", - "placement-group", - "prefix-list", - "replace-root-volume-task", - "reserved-instances", - "route-table", - "security-group", - "security-group-rule", - "snapshot", - "spot-fleet-request", - "spot-instances-request", - "subnet", - "subnet-cidr-reservation", - "traffic-mirror-filter", - "traffic-mirror-filter-rule", - "traffic-mirror-session", - "traffic-mirror-target", - "transit-gateway", - "transit-gateway-attachment", - "transit-gateway-connect-peer", - "transit-gateway-multicast-domain", - "transit-gateway-policy-table", - "transit-gateway-route-table", - "transit-gateway-route-table-announcement", - "verified-access-endpoint", - "verified-access-endpoint-target", - "verified-access-group", - "verified-access-instance", - "verified-access-policy", - "verified-access-trust-provider", - "volume", - "vpc", - "vpc-block-public-access-exclusion", - "vpc-endpoint", - "vpc-endpoint-connection", - "vpc-endpoint-connection-device-type", - "vpc-endpoint-service", - "vpc-endpoint-service-permission", - "vpc-flow-log", - "vpc-peering-connection", - "vpn-connection", - "vpn-connection-device-type", - "vpn-gateway" - ], - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array", - "uniqueItems": false - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "AvailabilityZone": { - "type": "string" - }, - "AvailableInstanceCount": { - "type": "integer" - }, - "EbsOptimized": { - "type": "boolean" - }, - "EndDate": { - "type": "string" - }, - "EndDateType": { - "enum": [ - "limited", - "unlimited" - ], - "type": "string" - }, - "EphemeralStorage": { - "type": "boolean" - }, - "Id": { - "type": "string" - }, - "InstanceCount": { - "type": "integer" - }, - "InstanceMatchCriteria": { - "enum": [ - "open", - "targeted" - ], - "type": "string" - }, - "InstancePlatform": { - "enum": [ - "Linux with SQL Server Enterprise", - "Linux with SQL Server Standard", - "Linux with SQL Server Web", - "Linux/UNIX", - "RHEL with HA", - "RHEL with HA and SQL Server Enterprise", - "RHEL with HA and SQL Server Standard", - "RHEL with SQL Server Enterprise", - "RHEL with SQL Server Standard", - "RHEL with SQL Server Web", - "Red Hat Enterprise Linux", - "SUSE Linux", - "Ubuntu Pro", - "Windows", - "Windows with SQL Server", - "Windows with SQL Server Enterprise", - "Windows with SQL Server Standard", - "Windows with SQL Server Web" - ], - "type": "string" - }, - "InstanceType": { - "type": "string" - }, - "OutPostArn": { - "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$", - "type": "string" - }, - "PlacementGroupArn": { - "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$", - "type": "string" - }, - "TagSpecifications": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/TagSpecification" - }, - "type": "array", - "uniqueItems": false - }, - "Tenancy": { - "enum": [ - "dedicated", - "default" - ], - "type": "string" - }, - "TotalInstanceCount": { - "type": "integer" - }, - "UnusedReservationBillingOwnerId": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/AvailableInstanceCount", - "/properties/TotalInstanceCount" - ], - "required": [ - "InstanceCount", - "AvailabilityZone", - "InstancePlatform", - "InstanceType" - ], - "typeName": "AWS::EC2::CapacityReservation", - "writeOnlyProperties": [ - "/properties/UnusedReservationBillingOwnerId" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ssmincidents-replicationset.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ssmincidents-replicationset.json deleted file mode 100644 index f2d65585be..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ssmincidents-replicationset.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "Arn": { - "maxLength": 1000, - "pattern": "^arn:aws(-(cn|us-gov|iso(-b)?))?:[a-z-]+:(([a-z]+-)+[0-9])?:([0-9]{12})?:[^.]+$", - "type": "string" - }, - "DeletionProtected": { - "type": "boolean" - }, - "RegionConfiguration": { - "additionalProperties": false, - "properties": { - "SseKmsKeyId": { - "$ref": "#/definitions/Arn" - } - }, - "required": [ - "SseKmsKeyId" - ], - "type": "object" - }, - "RegionList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ReplicationRegion" - }, - "maxItems": 3, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "RegionName": { - "maxLength": 20, - "type": "string" - }, - "ReplicationRegion": { - "additionalProperties": false, - "properties": { - "RegionConfiguration": { - "$ref": "#/definitions/RegionConfiguration" - }, - "RegionName": { - "$ref": "#/definitions/RegionName" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(?!aws:)[a-zA-Z+-=._:/]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn", - "additionalProperties": false - }, - "DeletionProtected": { - "$ref": "#/definitions/DeletionProtected", - "default": false - }, - "Regions": { - "$ref": "#/definitions/RegionList" - }, - "Tags": { - "default": [], - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "required": [ - "Regions" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ssm-incidents.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::SSMIncidents::ReplicationSet" -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py index ab14693fa2..3e725b58ba 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py @@ -835,6 +835,7 @@ "Module", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-amazonmq-broker.json", @@ -1413,6 +1414,7 @@ "aws-redshift-eventsubscription.json", "aws-redshift-integration.json", "aws-redshift-scheduledaction.json", + "aws-resiliencehub-app.json", "aws-resiliencehub-resiliencypolicy.json", "aws-resourceexplorer2-defaultviewassociation.json", "aws-resourceexplorer2-index.json", diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-acmpca-certificateauthority.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/KeyAlgorithm", - "/properties/SigningAlgorithm", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/KeyStorageSecurityStandard", - "/properties/UsageMode" - ], - "definitions": { - "AccessDescription": { - "additionalProperties": false, - "properties": { - "AccessLocation": { - "$ref": "#/definitions/GeneralName" - }, - "AccessMethod": { - "$ref": "#/definitions/AccessMethod" - } - }, - "required": [ - "AccessMethod", - "AccessLocation" - ], - "type": "object" - }, - "AccessMethod": { - "additionalProperties": false, - "properties": { - "AccessMethodType": { - "$ref": "#/definitions/AccessMethodType" - }, - "CustomObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - } - }, - "type": "object" - }, - "AccessMethodType": { - "type": "string" - }, - "Arn": { - "type": "string" - }, - "CrlConfiguration": { - "additionalProperties": false, - "properties": { - "CrlDistributionPointExtensionConfiguration": { - "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration" - }, - "CustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - }, - "Enabled": { - "type": "boolean" - }, - "ExpirationInDays": { - "type": "integer" - }, - "S3BucketName": { - "pattern": "[-a-zA-Z0-9._/]+", - "type": "string" - }, - "S3ObjectAcl": { - "enum": [ - "BUCKET_OWNER_FULL_CONTROL", - "PUBLIC_READ" - ], - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "CrlDistributionPointExtensionConfiguration": { - "additionalProperties": false, - "properties": { - "OmitExtension": { - "type": "boolean" - } - }, - "required": [ - "OmitExtension" - ], - "type": "object" - }, - "CsrExtensions": { - "additionalProperties": false, - "properties": { - "KeyUsage": { - "$ref": "#/definitions/KeyUsage" - }, - "SubjectInformationAccess": { - "$ref": "#/definitions/SubjectInformationAccess" - } - }, - "type": "object" - }, - "CustomAttribute": { - "additionalProperties": false, - "properties": { - "ObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "ObjectIdentifier", - "Value" - ], - "type": "object" - }, - "CustomAttributeList": { - "items": { - "$ref": "#/definitions/CustomAttribute" - }, - "type": "array" - }, - "CustomObjectIdentifier": { - "type": "string" - }, - "DnsName": { - "type": "string" - }, - "EdiPartyName": { - "additionalProperties": false, - "properties": { - "NameAssigner": { - "type": "string" - }, - "PartyName": { - "type": "string" - } - }, - "required": [ - "PartyName" - ], - "type": "object" - }, - "GeneralName": { - "additionalProperties": false, - "properties": { - "DirectoryName": { - "$ref": "#/definitions/Subject" - }, - "DnsName": { - "$ref": "#/definitions/DnsName" - }, - "EdiPartyName": { - "$ref": "#/definitions/EdiPartyName" - }, - "IpAddress": { - "$ref": "#/definitions/IpAddress" - }, - "OtherName": { - "$ref": "#/definitions/OtherName" - }, - "RegisteredId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Rfc822Name": { - "$ref": "#/definitions/Rfc822Name" - }, - "UniformResourceIdentifier": { - "$ref": "#/definitions/UniformResourceIdentifier" - } - }, - "type": "object" - }, - "IpAddress": { - "type": "string" - }, - "KeyUsage": { - "additionalProperties": false, - "properties": { - "CRLSign": { - "default": false, - "type": "boolean" - }, - "DataEncipherment": { - "default": false, - "type": "boolean" - }, - "DecipherOnly": { - "default": false, - "type": "boolean" - }, - "DigitalSignature": { - "default": false, - "type": "boolean" - }, - "EncipherOnly": { - "default": false, - "type": "boolean" - }, - "KeyAgreement": { - "default": false, - "type": "boolean" - }, - "KeyCertSign": { - "default": false, - "type": "boolean" - }, - "KeyEncipherment": { - "default": false, - "type": "boolean" - }, - "NonRepudiation": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "OcspConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "type": "boolean" - }, - "OcspCustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "OtherName": { - "additionalProperties": false, - "properties": { - "TypeId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "TypeId", - "Value" - ], - "type": "object" - }, - "RevocationConfiguration": { - "additionalProperties": false, - "properties": { - "CrlConfiguration": { - "$ref": "#/definitions/CrlConfiguration" - }, - "OcspConfiguration": { - "$ref": "#/definitions/OcspConfiguration" - } - }, - "type": "object" - }, - "Rfc822Name": { - "type": "string" - }, - "Subject": { - "additionalProperties": false, - "properties": { - "CommonName": { - "type": "string" - }, - "Country": { - "type": "string" - }, - "CustomAttributes": { - "$ref": "#/definitions/CustomAttributeList" - }, - "DistinguishedNameQualifier": { - "type": "string" - }, - "GenerationQualifier": { - "type": "string" - }, - "GivenName": { - "type": "string" - }, - "Initials": { - "type": "string" - }, - "Locality": { - "type": "string" - }, - "Organization": { - "type": "string" - }, - "OrganizationalUnit": { - "type": "string" - }, - "Pseudonym": { - "type": "string" - }, - "SerialNumber": { - "type": "string" - }, - "State": { - "type": "string" - }, - "Surname": { - "type": "string" - }, - "Title": { - "type": "string" - } - }, - "type": "object" - }, - "SubjectInformationAccess": { - "items": { - "$ref": "#/definitions/AccessDescription" - }, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - }, - "Value": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "UniformResourceIdentifier": { - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "CertificateSigningRequest": { - "type": "string" - }, - "CsrExtensions": { - "$ref": "#/definitions/CsrExtensions" - }, - "KeyAlgorithm": { - "type": "string" - }, - "KeyStorageSecurityStandard": { - "enum": [ - "CCPC_LEVEL_1_OR_HIGHER", - "FIPS_140_2_LEVEL_2_OR_HIGHER", - "FIPS_140_2_LEVEL_3_OR_HIGHER" - ], - "type": "string" - }, - "RevocationConfiguration": { - "$ref": "#/definitions/RevocationConfiguration" - }, - "SigningAlgorithm": { - "type": "string" - }, - "Subject": { - "$ref": "#/definitions/Subject" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - }, - "Type": { - "type": "string" - }, - "UsageMode": { - "enum": [ - "GENERAL_PURPOSE", - "SHORT_LIVED_CERTIFICATE" - ], - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CertificateSigningRequest" - ], - "required": [ - "Type", - "KeyAlgorithm", - "SigningAlgorithm", - "Subject" - ], - "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ACMPCA::CertificateAuthority", - "writeOnlyProperties": [ - "/properties/Subject", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/Tags", - "/properties/RevocationConfiguration", - "/properties/KeyStorageSecurityStandard" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-resiliencehub-app.json deleted file mode 100644 index 40b055a88b..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-resiliencehub-app.json +++ /dev/null @@ -1,222 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name" - ], - "definitions": { - "EventSubscription": { - "additionalProperties": false, - "properties": { - "EventType": { - "enum": [ - "ScheduledAssessmentFailure", - "DriftDetected" - ], - "type": "string" - }, - "Name": { - "maxLength": 256, - "type": "string" - }, - "SnsTopicArn": { - "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9/][A-Za-z0-9:_/+.-]{0,1023}$", - "type": "string" - } - }, - "required": [ - "Name", - "EventType" - ], - "type": "object" - }, - "IamRoleArn": { - "pattern": "arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):iam::[0-9]{12}:role\\/(([\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}$", - "type": "string" - }, - "PermissionModel": { - "additionalProperties": false, - "properties": { - "CrossAccountRoleArns": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/IamRoleArn" - }, - "type": "array", - "uniqueItems": false - }, - "InvokerRoleName": { - "pattern": "((\\u002F[\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}", - "type": "string" - }, - "Type": { - "enum": [ - "LegacyIAMUser", - "RoleBased" - ], - "type": "string" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "PhysicalResourceId": { - "additionalProperties": false, - "properties": { - "AwsAccountId": { - "pattern": "^[0-9]{12}$", - "type": "string" - }, - "AwsRegion": { - "pattern": "^[a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]$", - "type": "string" - }, - "Identifier": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "Type": { - "pattern": "Arn|Native", - "type": "string" - } - }, - "required": [ - "Identifier", - "Type" - ], - "type": "object" - }, - "ResourceMapping": { - "additionalProperties": false, - "properties": { - "EksSourceName": { - "type": "string" - }, - "LogicalStackName": { - "type": "string" - }, - "MappingType": { - "pattern": "CfnStack|Resource|Terraform|EKS", - "type": "string" - }, - "PhysicalResourceId": { - "$ref": "#/definitions/PhysicalResourceId" - }, - "ResourceName": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "TerraformSourceName": { - "type": "string" - } - }, - "required": [ - "MappingType", - "PhysicalResourceId" - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "patternProperties": { - ".{1,128}": { - "$ref": "#/definitions/TagValue" - } - }, - "type": "object" - }, - "TagValue": { - "maxLength": 256, - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/AppArn" - ], - "properties": { - "AppArn": { - "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$", - "type": "string" - }, - "AppAssessmentSchedule": { - "enum": [ - "Disabled", - "Daily" - ], - "type": "string" - }, - "AppTemplateBody": { - "maxLength": 409600, - "minLength": 0, - "pattern": "^[\\w\\s:,-\\.'\\/{}\\[\\]:\"]+$", - "type": "string" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "DriftStatus": { - "enum": [ - "NotChecked", - "NotDetected", - "Detected" - ], - "type": "string" - }, - "EventSubscriptions": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/EventSubscription" - }, - "type": "array", - "uniqueItems": false - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "PermissionModel": { - "$ref": "#/definitions/PermissionModel" - }, - "RegulatoryPolicyArn": { - "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$", - "type": "string" - }, - "ResiliencyPolicyArn": { - "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$", - "type": "string" - }, - "ResourceMappings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ResourceMapping" - }, - "type": "array", - "uniqueItems": false - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/AppArn", - "/properties/DriftStatus" - ], - "required": [ - "Name", - "AppTemplateBody", - "ResourceMappings" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-resiliencehub", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ResilienceHub::App" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py index 7dde280074..93ce1b6488 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py @@ -1693,6 +1693,7 @@ "aws-ec2-transitgatewayroutetableassociation.json", "aws-ec2-transitgatewayroutetablepropagation.json", "aws-ec2-transitgatewayvpcattachment.json", + "aws-ec2-verifiedaccessendpoint.json", "aws-ec2-verifiedaccessgroup.json", "aws-ec2-verifiedaccessinstance.json", "aws-ec2-verifiedaccesstrustprovider.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py index 7d076671fb..165a6181ad 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py @@ -1352,6 +1352,7 @@ "aws-bedrock-flowversion.json", "aws-bedrock-guardrail.json", "aws-bedrock-guardrailversion.json", + "aws-bedrock-knowledgebase.json", "aws-bedrock-prompt.json", "aws-bedrock-promptversion.json", "aws-budgets-budget.json", @@ -2299,6 +2300,7 @@ "aws-ssmcontacts-contactchannel.json", "aws-ssmcontacts-plan.json", "aws-ssmcontacts-rotation.json", + "aws-ssmincidents-replicationset.json", "aws-ssmincidents-responseplan.json", "aws-ssmquicksetup-configurationmanager.json", "aws-sso-application.json", @@ -2317,6 +2319,7 @@ "aws-synthetics-canary.json", "aws-synthetics-group.json", "aws-systemsmanagersap-application.json", + "aws-timestream-influxdbinstance.json", "aws-transfer-agreement.json", "aws-transfer-certificate.json", "aws-transfer-connector.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-knowledgebase.json deleted file mode 100644 index 75bbdf1578..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-knowledgebase.json +++ /dev/null @@ -1,974 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/StorageConfiguration", - "/properties/KnowledgeBaseConfiguration/Type", - "/properties/KnowledgeBaseConfiguration/VectorKnowledgeBaseConfiguration", - "/properties/KnowledgeBaseConfiguration/KendraKnowledgeBaseConfiguration", - "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/Type", - "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/RedshiftConfiguration/StorageConfigurations", - "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/RedshiftConfiguration/QueryEngineConfiguration" - ], - "definitions": { - "AwsDataCatalogTableName": { - "maxLength": 200, - "minLength": 1, - "pattern": "^.*\\.*$", - "type": "string" - }, - "AwsDataCatalogTableNames": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/AwsDataCatalogTableName" - }, - "maxItems": 1000, - "minItems": 1, - "type": "array" - }, - "BedrockEmbeddingModelConfiguration": { - "additionalProperties": false, - "properties": { - "Dimensions": { - "maximum": 4096, - "minimum": 0, - "type": "integer" - } - }, - "type": "object" - }, - "CuratedQueries": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/CuratedQuery" - }, - "maxItems": 10, - "type": "array" - }, - "CuratedQuery": { - "additionalProperties": false, - "properties": { - "NaturalLanguage": { - "$ref": "#/definitions/NaturalLanguageString" - }, - "Sql": { - "$ref": "#/definitions/SqlString" - } - }, - "required": [ - "NaturalLanguage", - "Sql" - ], - "type": "object" - }, - "DescriptionString": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "EmbeddingModelConfiguration": { - "additionalProperties": false, - "properties": { - "BedrockEmbeddingModelConfiguration": { - "$ref": "#/definitions/BedrockEmbeddingModelConfiguration" - } - }, - "type": "object" - }, - "InclusionType": { - "enum": [ - "INCLUDE", - "EXCLUDE" - ], - "type": "string" - }, - "KendraIndexArn": { - "pattern": "^arn:aws(|-cn|-us-gov):kendra:[a-z0-9-]{1,20}:([0-9]{12}|):index/([a-zA-Z0-9][a-zA-Z0-9-]{35}|[a-zA-Z0-9][a-zA-Z0-9-]{35}-[a-zA-Z0-9][a-zA-Z0-9-]{35})$", - "type": "string" - }, - "KendraKnowledgeBaseConfiguration": { - "additionalProperties": false, - "properties": { - "KendraIndexArn": { - "$ref": "#/definitions/KendraIndexArn" - } - }, - "required": [ - "KendraIndexArn" - ], - "type": "object" - }, - "KnowledgeBaseConfiguration": { - "additionalProperties": false, - "properties": { - "KendraKnowledgeBaseConfiguration": { - "$ref": "#/definitions/KendraKnowledgeBaseConfiguration" - }, - "SqlKnowledgeBaseConfiguration": { - "$ref": "#/definitions/SqlKnowledgeBaseConfiguration" - }, - "Type": { - "$ref": "#/definitions/KnowledgeBaseType" - }, - "VectorKnowledgeBaseConfiguration": { - "$ref": "#/definitions/VectorKnowledgeBaseConfiguration" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "KnowledgeBaseStatus": { - "enum": [ - "CREATING", - "ACTIVE", - "DELETING", - "UPDATING", - "FAILED", - "DELETE_UNSUCCESSFUL" - ], - "type": "string" - }, - "KnowledgeBaseStorageType": { - "enum": [ - "OPENSEARCH_SERVERLESS", - "PINECONE", - "RDS", - "MONGO_DB_ATLAS" - ], - "type": "string" - }, - "KnowledgeBaseType": { - "enum": [ - "VECTOR", - "KENDRA", - "SQL" - ], - "type": "string" - }, - "MongoDbAtlasConfiguration": { - "additionalProperties": false, - "properties": { - "CollectionName": { - "maxLength": 63, - "pattern": "^.*$", - "type": "string" - }, - "CredentialsSecretArn": { - "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$", - "type": "string" - }, - "DatabaseName": { - "maxLength": 63, - "pattern": "^.*$", - "type": "string" - }, - "Endpoint": { - "maxLength": 2048, - "pattern": "^[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_-]+\\.mongodb\\.net$", - "type": "string" - }, - "EndpointServiceName": { - "maxLength": 255, - "pattern": "^(?:arn:aws(?:-us-gov|-cn|-iso|-iso-[a-z])*:.+:.*:\\d+:.+/.+$|[a-zA-Z0-9*]+[a-zA-Z0-9._-]*)$", - "type": "string" - }, - "FieldMapping": { - "$ref": "#/definitions/MongoDbAtlasFieldMapping" - }, - "VectorIndexName": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "Endpoint", - "CredentialsSecretArn", - "DatabaseName", - "CollectionName", - "VectorIndexName", - "FieldMapping" - ], - "type": "object" - }, - "MongoDbAtlasFieldMapping": { - "additionalProperties": false, - "properties": { - "MetadataField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "TextField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "VectorField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "VectorField", - "MetadataField", - "TextField" - ], - "type": "object" - }, - "NaturalLanguageString": { - "maxLength": 1000, - "minLength": 1, - "type": "string" - }, - "OpenSearchServerlessConfiguration": { - "additionalProperties": false, - "properties": { - "CollectionArn": { - "maxLength": 2048, - "pattern": "^arn:aws(|-cn|-us-gov|-iso):aoss:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:collection/[a-z0-9-]{3,32}$", - "type": "string" - }, - "FieldMapping": { - "$ref": "#/definitions/OpenSearchServerlessFieldMapping" - }, - "VectorIndexName": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "CollectionArn", - "FieldMapping", - "VectorIndexName" - ], - "type": "object" - }, - "OpenSearchServerlessFieldMapping": { - "additionalProperties": false, - "properties": { - "MetadataField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "TextField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "VectorField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "MetadataField", - "TextField", - "VectorField" - ], - "type": "object" - }, - "PineconeConfiguration": { - "additionalProperties": false, - "properties": { - "ConnectionString": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "CredentialsSecretArn": { - "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$", - "type": "string" - }, - "FieldMapping": { - "$ref": "#/definitions/PineconeFieldMapping" - }, - "Namespace": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "ConnectionString", - "CredentialsSecretArn", - "FieldMapping" - ], - "type": "object" - }, - "PineconeFieldMapping": { - "additionalProperties": false, - "properties": { - "MetadataField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "TextField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "MetadataField", - "TextField" - ], - "type": "object" - }, - "QueryEngineType": { - "enum": [ - "REDSHIFT" - ], - "type": "string" - }, - "QueryExecutionTimeoutSeconds": { - "maximum": 200, - "minimum": 1, - "type": "integer" - }, - "QueryGenerationColumn": { - "additionalProperties": false, - "properties": { - "Description": { - "$ref": "#/definitions/DescriptionString" - }, - "Inclusion": { - "$ref": "#/definitions/InclusionType" - }, - "Name": { - "$ref": "#/definitions/QueryGenerationColumnName" - } - }, - "type": "object" - }, - "QueryGenerationColumnName": { - "maxLength": 127, - "minLength": 1, - "type": "string" - }, - "QueryGenerationColumns": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/QueryGenerationColumn" - }, - "type": "array" - }, - "QueryGenerationConfiguration": { - "additionalProperties": false, - "properties": { - "ExecutionTimeoutSeconds": { - "$ref": "#/definitions/QueryExecutionTimeoutSeconds" - }, - "GenerationContext": { - "$ref": "#/definitions/QueryGenerationContext" - } - }, - "type": "object" - }, - "QueryGenerationContext": { - "additionalProperties": false, - "properties": { - "CuratedQueries": { - "$ref": "#/definitions/CuratedQueries" - }, - "Tables": { - "$ref": "#/definitions/QueryGenerationTables" - } - }, - "type": "object" - }, - "QueryGenerationTable": { - "additionalProperties": false, - "properties": { - "Columns": { - "$ref": "#/definitions/QueryGenerationColumns" - }, - "Description": { - "$ref": "#/definitions/DescriptionString" - }, - "Inclusion": { - "$ref": "#/definitions/InclusionType" - }, - "Name": { - "$ref": "#/definitions/QueryGenerationTableName" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "QueryGenerationTableName": { - "pattern": "^.*\\..*\\..*$", - "type": "string" - }, - "QueryGenerationTables": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/QueryGenerationTable" - }, - "maxItems": 50, - "type": "array" - }, - "RdsConfiguration": { - "additionalProperties": false, - "properties": { - "CredentialsSecretArn": { - "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$", - "type": "string" - }, - "DatabaseName": { - "maxLength": 63, - "pattern": "^[a-zA-Z0-9_\\-]+$", - "type": "string" - }, - "FieldMapping": { - "$ref": "#/definitions/RdsFieldMapping" - }, - "ResourceArn": { - "pattern": "^arn:aws(|-cn|-us-gov):rds:[a-zA-Z0-9-]*:[0-9]{12}:cluster:[a-zA-Z0-9-]{1,63}$", - "type": "string" - }, - "TableName": { - "maxLength": 63, - "pattern": "^[a-zA-Z0-9_\\.\\-]+$", - "type": "string" - } - }, - "required": [ - "CredentialsSecretArn", - "DatabaseName", - "FieldMapping", - "ResourceArn", - "TableName" - ], - "type": "object" - }, - "RdsFieldMapping": { - "additionalProperties": false, - "properties": { - "MetadataField": { - "maxLength": 63, - "pattern": "^[a-zA-Z0-9_\\-]+$", - "type": "string" - }, - "PrimaryKeyField": { - "maxLength": 63, - "pattern": "^[a-zA-Z0-9_\\-]+$", - "type": "string" - }, - "TextField": { - "maxLength": 63, - "pattern": "^[a-zA-Z0-9_\\-]+$", - "type": "string" - }, - "VectorField": { - "maxLength": 63, - "pattern": "^[a-zA-Z0-9_\\-]+$", - "type": "string" - } - }, - "required": [ - "MetadataField", - "PrimaryKeyField", - "TextField", - "VectorField" - ], - "type": "object" - }, - "RedisEnterpriseCloudConfiguration": { - "additionalProperties": false, - "properties": { - "CredentialsSecretArn": { - "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$", - "type": "string" - }, - "Endpoint": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "FieldMapping": { - "$ref": "#/definitions/RedisEnterpriseCloudFieldMapping" - }, - "VectorIndexName": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "CredentialsSecretArn", - "Endpoint", - "FieldMapping", - "VectorIndexName" - ], - "type": "object" - }, - "RedisEnterpriseCloudFieldMapping": { - "additionalProperties": false, - "properties": { - "MetadataField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "TextField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - }, - "VectorField": { - "maxLength": 2048, - "pattern": "^.*$", - "type": "string" - } - }, - "required": [ - "MetadataField", - "TextField", - "VectorField" - ], - "type": "object" - }, - "RedshiftClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "RedshiftConfiguration": { - "additionalProperties": false, - "properties": { - "QueryEngineConfiguration": { - "$ref": "#/definitions/RedshiftQueryEngineConfiguration" - }, - "QueryGenerationConfiguration": { - "$ref": "#/definitions/QueryGenerationConfiguration" - }, - "StorageConfigurations": { - "$ref": "#/definitions/RedshiftQueryEngineStorageConfigurations" - } - }, - "required": [ - "StorageConfigurations", - "QueryEngineConfiguration" - ], - "type": "object" - }, - "RedshiftDatabase": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "RedshiftProvisionedAuthConfiguration": { - "additionalProperties": false, - "properties": { - "DatabaseUser": { - "type": "string" - }, - "Type": { - "$ref": "#/definitions/RedshiftProvisionedAuthType" - }, - "UsernamePasswordSecretArn": { - "$ref": "#/definitions/SecretArn" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "RedshiftProvisionedAuthType": { - "enum": [ - "IAM", - "USERNAME_PASSWORD", - "USERNAME" - ], - "type": "string" - }, - "RedshiftProvisionedConfiguration": { - "additionalProperties": false, - "properties": { - "AuthConfiguration": { - "$ref": "#/definitions/RedshiftProvisionedAuthConfiguration" - }, - "ClusterIdentifier": { - "$ref": "#/definitions/RedshiftClusterIdentifier" - } - }, - "required": [ - "ClusterIdentifier", - "AuthConfiguration" - ], - "type": "object" - }, - "RedshiftQueryEngineAwsDataCatalogStorageConfiguration": { - "additionalProperties": false, - "properties": { - "TableNames": { - "$ref": "#/definitions/AwsDataCatalogTableNames" - } - }, - "required": [ - "TableNames" - ], - "type": "object" - }, - "RedshiftQueryEngineConfiguration": { - "additionalProperties": false, - "properties": { - "ProvisionedConfiguration": { - "$ref": "#/definitions/RedshiftProvisionedConfiguration" - }, - "ServerlessConfiguration": { - "$ref": "#/definitions/RedshiftServerlessConfiguration" - }, - "Type": { - "$ref": "#/definitions/RedshiftQueryEngineType" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "RedshiftQueryEngineRedshiftStorageConfiguration": { - "additionalProperties": false, - "properties": { - "DatabaseName": { - "$ref": "#/definitions/RedshiftDatabase" - } - }, - "required": [ - "DatabaseName" - ], - "type": "object" - }, - "RedshiftQueryEngineStorageConfiguration": { - "additionalProperties": false, - "properties": { - "AwsDataCatalogConfiguration": { - "$ref": "#/definitions/RedshiftQueryEngineAwsDataCatalogStorageConfiguration" - }, - "RedshiftConfiguration": { - "$ref": "#/definitions/RedshiftQueryEngineRedshiftStorageConfiguration" - }, - "Type": { - "$ref": "#/definitions/RedshiftQueryEngineStorageType" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "RedshiftQueryEngineStorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/RedshiftQueryEngineStorageConfiguration" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "RedshiftQueryEngineStorageType": { - "enum": [ - "REDSHIFT", - "AWS_DATA_CATALOG" - ], - "type": "string" - }, - "RedshiftQueryEngineType": { - "enum": [ - "SERVERLESS", - "PROVISIONED" - ], - "type": "string" - }, - "RedshiftServerlessAuthConfiguration": { - "additionalProperties": false, - "properties": { - "Type": { - "$ref": "#/definitions/RedshiftServerlessAuthType" - }, - "UsernamePasswordSecretArn": { - "$ref": "#/definitions/SecretArn" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "RedshiftServerlessAuthType": { - "enum": [ - "IAM", - "USERNAME_PASSWORD" - ], - "type": "string" - }, - "RedshiftServerlessConfiguration": { - "additionalProperties": false, - "properties": { - "AuthConfiguration": { - "$ref": "#/definitions/RedshiftServerlessAuthConfiguration" - }, - "WorkgroupArn": { - "$ref": "#/definitions/WorkgroupArn" - } - }, - "required": [ - "WorkgroupArn", - "AuthConfiguration" - ], - "type": "object" - }, - "S3Location": { - "additionalProperties": false, - "properties": { - "URI": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^s3://.{1,128}$", - "type": "string" - } - }, - "required": [ - "URI" - ], - "type": "object" - }, - "SecretArn": { - "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$", - "type": "string" - }, - "SqlKnowledgeBaseConfiguration": { - "additionalProperties": false, - "properties": { - "RedshiftConfiguration": { - "$ref": "#/definitions/RedshiftConfiguration" - }, - "Type": { - "$ref": "#/definitions/QueryEngineType" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "SqlString": { - "maxLength": 1000, - "minLength": 1, - "type": "string" - }, - "StorageConfiguration": { - "additionalProperties": false, - "oneOf": [ - { - "required": [ - "OpensearchServerlessConfiguration" - ] - }, - { - "required": [ - "PineconeConfiguration" - ] - }, - { - "required": [ - "RdsConfiguration" - ] - }, - { - "required": [ - "MongoDbAtlasConfiguration" - ] - } - ], - "properties": { - "MongoDbAtlasConfiguration": { - "$ref": "#/definitions/MongoDbAtlasConfiguration" - }, - "OpensearchServerlessConfiguration": { - "$ref": "#/definitions/OpenSearchServerlessConfiguration" - }, - "PineconeConfiguration": { - "$ref": "#/definitions/PineconeConfiguration" - }, - "RdsConfiguration": { - "$ref": "#/definitions/RdsConfiguration" - }, - "Type": { - "$ref": "#/definitions/KnowledgeBaseStorageType" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "SupplementalDataStorageConfiguration": { - "additionalProperties": false, - "properties": { - "SupplementalDataStorageLocations": { - "$ref": "#/definitions/SupplementalDataStorageLocations" - } - }, - "required": [ - "SupplementalDataStorageLocations" - ], - "type": "object" - }, - "SupplementalDataStorageLocation": { - "additionalProperties": false, - "properties": { - "S3Location": { - "$ref": "#/definitions/S3Location" - }, - "SupplementalDataStorageLocationType": { - "$ref": "#/definitions/SupplementalDataStorageLocationType" - } - }, - "required": [ - "SupplementalDataStorageLocationType" - ], - "type": "object" - }, - "SupplementalDataStorageLocationType": { - "enum": [ - "S3" - ], - "type": "string" - }, - "SupplementalDataStorageLocations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SupplementalDataStorageLocation" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "TagsMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z0-9\\s._:/=+@-]*$": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$", - "type": "string" - } - }, - "type": "object" - }, - "VectorKnowledgeBaseConfiguration": { - "additionalProperties": false, - "properties": { - "EmbeddingModelArn": { - "maxLength": 2048, - "minLength": 20, - "pattern": "^(arn:aws(-[^:]+)?:[a-z0-9-]+:[a-z0-9-]{1,20}:[0-9]{0,12}:[a-zA-Z0-9-:/._+]+)$", - "type": "string" - }, - "EmbeddingModelConfiguration": { - "$ref": "#/definitions/EmbeddingModelConfiguration" - }, - "SupplementalDataStorageConfiguration": { - "$ref": "#/definitions/SupplementalDataStorageConfiguration" - } - }, - "required": [ - "EmbeddingModelArn" - ], - "type": "object" - }, - "WorkgroupArn": { - "pattern": "^(arn:(aws(-[a-z]+)*):redshift-serverless:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:workgroup/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$", - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/KnowledgeBaseId" - ], - "properties": { - "CreatedAt": { - "type": "string" - }, - "Description": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "FailureReasons": { - "insertionOrder": false, - "items": { - "maxLength": 2048, - "type": "string" - }, - "maxItems": 2048, - "type": "array" - }, - "KnowledgeBaseArn": { - "maxLength": 128, - "minLength": 0, - "pattern": "^arn:aws(|-cn|-us-gov):bedrock:[a-zA-Z0-9-]*:[0-9]{12}:knowledge-base/[0-9a-zA-Z]+$", - "type": "string" - }, - "KnowledgeBaseConfiguration": { - "$ref": "#/definitions/KnowledgeBaseConfiguration" - }, - "KnowledgeBaseId": { - "pattern": "^[0-9a-zA-Z]{10}$", - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "RoleArn": { - "maxLength": 2048, - "pattern": "^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+$", - "type": "string" - }, - "Status": { - "$ref": "#/definitions/KnowledgeBaseStatus" - }, - "StorageConfiguration": { - "$ref": "#/definitions/StorageConfiguration" - }, - "Tags": { - "$ref": "#/definitions/TagsMap" - }, - "UpdatedAt": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/KnowledgeBaseId", - "/properties/KnowledgeBaseArn", - "/properties/CreatedAt", - "/properties/UpdatedAt", - "/properties/FailureReasons", - "/properties/Status" - ], - "required": [ - "KnowledgeBaseConfiguration", - "Name", - "RoleArn" - ], - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::Bedrock::KnowledgeBase" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssmincidents-replicationset.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssmincidents-replicationset.json deleted file mode 100644 index f2d65585be..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssmincidents-replicationset.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "Arn": { - "maxLength": 1000, - "pattern": "^arn:aws(-(cn|us-gov|iso(-b)?))?:[a-z-]+:(([a-z]+-)+[0-9])?:([0-9]{12})?:[^.]+$", - "type": "string" - }, - "DeletionProtected": { - "type": "boolean" - }, - "RegionConfiguration": { - "additionalProperties": false, - "properties": { - "SseKmsKeyId": { - "$ref": "#/definitions/Arn" - } - }, - "required": [ - "SseKmsKeyId" - ], - "type": "object" - }, - "RegionList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ReplicationRegion" - }, - "maxItems": 3, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "RegionName": { - "maxLength": 20, - "type": "string" - }, - "ReplicationRegion": { - "additionalProperties": false, - "properties": { - "RegionConfiguration": { - "$ref": "#/definitions/RegionConfiguration" - }, - "RegionName": { - "$ref": "#/definitions/RegionName" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(?!aws:)[a-zA-Z+-=._:/]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn", - "additionalProperties": false - }, - "DeletionProtected": { - "$ref": "#/definitions/DeletionProtected", - "default": false - }, - "Regions": { - "$ref": "#/definitions/RegionList" - }, - "Tags": { - "default": [], - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "required": [ - "Regions" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ssm-incidents.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::SSMIncidents::ReplicationSet" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-timestream-influxdbinstance.json deleted file mode 100644 index bfd94ca75f..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-timestream-influxdbinstance.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Username", - "/properties/Password", - "/properties/Organization", - "/properties/Bucket", - "/properties/VpcSubnetIds", - "/properties/VpcSecurityGroupIds", - "/properties/PubliclyAccessible", - "/properties/DbStorageType", - "/properties/AllocatedStorage" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "AllocatedStorage": { - "maximum": 16384, - "minimum": 20, - "type": "integer" - }, - "Arn": { - "maxLength": 1011, - "minLength": 1, - "pattern": "^arn:aws[a-z\\-]*:timestream\\-influxdb:[a-z0-9\\-]+:[0-9]{12}:(db\\-instance)/[a-zA-Z0-9]{3,64}$", - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "Bucket": { - "maxLength": 64, - "minLength": 2, - "pattern": "^[^_][^\"]*$", - "type": "string" - }, - "DbInstanceType": { - "enum": [ - "db.influx.medium", - "db.influx.large", - "db.influx.xlarge", - "db.influx.2xlarge", - "db.influx.4xlarge", - "db.influx.8xlarge", - "db.influx.12xlarge", - "db.influx.16xlarge" - ], - "type": "string" - }, - "DbParameterGroupIdentifier": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "DbStorageType": { - "enum": [ - "InfluxIOIncludedT1", - "InfluxIOIncludedT2", - "InfluxIOIncludedT3" - ], - "type": "string" - }, - "DeploymentType": { - "enum": [ - "SINGLE_AZ", - "WITH_MULTIAZ_STANDBY" - ], - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "Id": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "InfluxAuthParametersSecretArn": { - "pattern": "^arn:[a-z]*:secretsmanager:[a-z\\-0-9]*:[0-9]*:secret:[a-zA-Z0-9\\-]*", - "type": "string" - }, - "LogDeliveryConfiguration": { - "additionalProperties": false, - "properties": { - "S3Configuration": { - "additionalProperties": false, - "properties": { - "BucketName": { - "maxLength": 63, - "minLength": 3, - "pattern": "^[0-9a-z]+[0-9a-z\\.\\-]*[0-9a-z]+$", - "type": "string" - }, - "Enabled": { - "type": "boolean" - } - }, - "required": [ - "Enabled", - "BucketName" - ], - "type": "object" - } - }, - "required": [ - "S3Configuration" - ], - "type": "object" - }, - "Name": { - "maxLength": 40, - "minLength": 3, - "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", - "type": "string" - }, - "Organization": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "Password": { - "maxLength": 64, - "minLength": 8, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "Port": { - "maximum": 65535, - "minimum": 1024, - "type": "integer" - }, - "PubliclyAccessible": { - "default": false, - "type": "boolean" - }, - "SecondaryAvailabilityZone": { - "type": "string" - }, - "Status": { - "enum": [ - "CREATING", - "AVAILABLE", - "DELETING", - "MODIFYING", - "UPDATING", - "UPDATING_DEPLOYMENT_TYPE", - "UPDATING_INSTANCE_TYPE", - "DELETED", - "FAILED" - ], - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 200, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "Username": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "VpcSecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "maxItems": 5, - "minItems": 1, - "type": "array" - }, - "VpcSubnetIds": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "maxItems": 3, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Status", - "/properties/Arn", - "/properties/Id", - "/properties/AvailabilityZone", - "/properties/Endpoint", - "/properties/SecondaryAvailabilityZone", - "/properties/InfluxAuthParametersSecretArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::Timestream::InfluxDBInstance", - "writeOnlyProperties": [ - "/properties/Username", - "/properties/Password", - "/properties/Organization", - "/properties/Bucket" - ] -} diff --git a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py index f879695cfc..44efd3445e 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py @@ -723,6 +723,7 @@ "Module", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-amazonmq-broker.json", @@ -1137,6 +1138,7 @@ "aws-neptune-dbcluster.json", "aws-neptune-dbsubnetgroup.json", "aws-neptune-eventsubscription.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-acmpca-certificateauthority.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/KeyAlgorithm", - "/properties/SigningAlgorithm", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/KeyStorageSecurityStandard", - "/properties/UsageMode" - ], - "definitions": { - "AccessDescription": { - "additionalProperties": false, - "properties": { - "AccessLocation": { - "$ref": "#/definitions/GeneralName" - }, - "AccessMethod": { - "$ref": "#/definitions/AccessMethod" - } - }, - "required": [ - "AccessMethod", - "AccessLocation" - ], - "type": "object" - }, - "AccessMethod": { - "additionalProperties": false, - "properties": { - "AccessMethodType": { - "$ref": "#/definitions/AccessMethodType" - }, - "CustomObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - } - }, - "type": "object" - }, - "AccessMethodType": { - "type": "string" - }, - "Arn": { - "type": "string" - }, - "CrlConfiguration": { - "additionalProperties": false, - "properties": { - "CrlDistributionPointExtensionConfiguration": { - "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration" - }, - "CustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - }, - "Enabled": { - "type": "boolean" - }, - "ExpirationInDays": { - "type": "integer" - }, - "S3BucketName": { - "pattern": "[-a-zA-Z0-9._/]+", - "type": "string" - }, - "S3ObjectAcl": { - "enum": [ - "BUCKET_OWNER_FULL_CONTROL", - "PUBLIC_READ" - ], - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "CrlDistributionPointExtensionConfiguration": { - "additionalProperties": false, - "properties": { - "OmitExtension": { - "type": "boolean" - } - }, - "required": [ - "OmitExtension" - ], - "type": "object" - }, - "CsrExtensions": { - "additionalProperties": false, - "properties": { - "KeyUsage": { - "$ref": "#/definitions/KeyUsage" - }, - "SubjectInformationAccess": { - "$ref": "#/definitions/SubjectInformationAccess" - } - }, - "type": "object" - }, - "CustomAttribute": { - "additionalProperties": false, - "properties": { - "ObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "ObjectIdentifier", - "Value" - ], - "type": "object" - }, - "CustomAttributeList": { - "items": { - "$ref": "#/definitions/CustomAttribute" - }, - "type": "array" - }, - "CustomObjectIdentifier": { - "type": "string" - }, - "DnsName": { - "type": "string" - }, - "EdiPartyName": { - "additionalProperties": false, - "properties": { - "NameAssigner": { - "type": "string" - }, - "PartyName": { - "type": "string" - } - }, - "required": [ - "PartyName" - ], - "type": "object" - }, - "GeneralName": { - "additionalProperties": false, - "properties": { - "DirectoryName": { - "$ref": "#/definitions/Subject" - }, - "DnsName": { - "$ref": "#/definitions/DnsName" - }, - "EdiPartyName": { - "$ref": "#/definitions/EdiPartyName" - }, - "IpAddress": { - "$ref": "#/definitions/IpAddress" - }, - "OtherName": { - "$ref": "#/definitions/OtherName" - }, - "RegisteredId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Rfc822Name": { - "$ref": "#/definitions/Rfc822Name" - }, - "UniformResourceIdentifier": { - "$ref": "#/definitions/UniformResourceIdentifier" - } - }, - "type": "object" - }, - "IpAddress": { - "type": "string" - }, - "KeyUsage": { - "additionalProperties": false, - "properties": { - "CRLSign": { - "default": false, - "type": "boolean" - }, - "DataEncipherment": { - "default": false, - "type": "boolean" - }, - "DecipherOnly": { - "default": false, - "type": "boolean" - }, - "DigitalSignature": { - "default": false, - "type": "boolean" - }, - "EncipherOnly": { - "default": false, - "type": "boolean" - }, - "KeyAgreement": { - "default": false, - "type": "boolean" - }, - "KeyCertSign": { - "default": false, - "type": "boolean" - }, - "KeyEncipherment": { - "default": false, - "type": "boolean" - }, - "NonRepudiation": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "OcspConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "type": "boolean" - }, - "OcspCustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "OtherName": { - "additionalProperties": false, - "properties": { - "TypeId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "TypeId", - "Value" - ], - "type": "object" - }, - "RevocationConfiguration": { - "additionalProperties": false, - "properties": { - "CrlConfiguration": { - "$ref": "#/definitions/CrlConfiguration" - }, - "OcspConfiguration": { - "$ref": "#/definitions/OcspConfiguration" - } - }, - "type": "object" - }, - "Rfc822Name": { - "type": "string" - }, - "Subject": { - "additionalProperties": false, - "properties": { - "CommonName": { - "type": "string" - }, - "Country": { - "type": "string" - }, - "CustomAttributes": { - "$ref": "#/definitions/CustomAttributeList" - }, - "DistinguishedNameQualifier": { - "type": "string" - }, - "GenerationQualifier": { - "type": "string" - }, - "GivenName": { - "type": "string" - }, - "Initials": { - "type": "string" - }, - "Locality": { - "type": "string" - }, - "Organization": { - "type": "string" - }, - "OrganizationalUnit": { - "type": "string" - }, - "Pseudonym": { - "type": "string" - }, - "SerialNumber": { - "type": "string" - }, - "State": { - "type": "string" - }, - "Surname": { - "type": "string" - }, - "Title": { - "type": "string" - } - }, - "type": "object" - }, - "SubjectInformationAccess": { - "items": { - "$ref": "#/definitions/AccessDescription" - }, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - }, - "Value": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "UniformResourceIdentifier": { - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "CertificateSigningRequest": { - "type": "string" - }, - "CsrExtensions": { - "$ref": "#/definitions/CsrExtensions" - }, - "KeyAlgorithm": { - "type": "string" - }, - "KeyStorageSecurityStandard": { - "enum": [ - "CCPC_LEVEL_1_OR_HIGHER", - "FIPS_140_2_LEVEL_2_OR_HIGHER", - "FIPS_140_2_LEVEL_3_OR_HIGHER" - ], - "type": "string" - }, - "RevocationConfiguration": { - "$ref": "#/definitions/RevocationConfiguration" - }, - "SigningAlgorithm": { - "type": "string" - }, - "Subject": { - "$ref": "#/definitions/Subject" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - }, - "Type": { - "type": "string" - }, - "UsageMode": { - "enum": [ - "GENERAL_PURPOSE", - "SHORT_LIVED_CERTIFICATE" - ], - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CertificateSigningRequest" - ], - "required": [ - "Type", - "KeyAlgorithm", - "SigningAlgorithm", - "Subject" - ], - "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ACMPCA::CertificateAuthority", - "writeOnlyProperties": [ - "/properties/Subject", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/Tags", - "/properties/RevocationConfiguration", - "/properties/KeyStorageSecurityStandard" - ] -} diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-networkfirewall-firewall.json +++ /dev/null @@ -1,147 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/VpcId", - "/properties/FirewallName" - ], - "definitions": { - "EndpointId": { - "type": "string" - }, - "ResourceArn": { - "maxLength": 256, - "minLength": 1, - "pattern": "^arn:aws.*$", - "type": "string" - }, - "SubnetMapping": { - "additionalProperties": false, - "properties": { - "IPAddressType": { - "enum": [ - "DUALSTACK", - "IPV4", - "IPV6" - ], - "type": "string" - }, - "SubnetId": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - } - }, - "required": [ - "SubnetId" - ], - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 255, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/FirewallArn" - ], - "properties": { - "DeleteProtection": { - "type": "boolean" - }, - "Description": { - "maxLength": 512, - "pattern": "^.*$", - "type": "string" - }, - "EndpointIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/EndpointId" - }, - "type": "array" - }, - "FirewallArn": { - "$ref": "#/definitions/ResourceArn" - }, - "FirewallId": { - "maxLength": 36, - "minLength": 36, - "pattern": "^([0-9a-f]{8})-([0-9a-f]{4}-){3}([0-9a-f]{12})$", - "type": "string" - }, - "FirewallName": { - "maxLength": 128, - "minLength": 1, - "pattern": "^[a-zA-Z0-9-]+$", - "type": "string" - }, - "FirewallPolicyArn": { - "$ref": "#/definitions/ResourceArn" - }, - "FirewallPolicyChangeProtection": { - "type": "boolean" - }, - "SubnetChangeProtection": { - "type": "boolean" - }, - "SubnetMappings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetMapping" - }, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array", - "uniqueItems": true - }, - "VpcId": { - "format": "AWS::EC2::VPC.Id", - "maxLength": 128, - "minLength": 1, - "pattern": "^vpc-[0-9a-f]+$", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/FirewallArn", - "/properties/FirewallId", - "/properties/EndpointIds" - ], - "required": [ - "FirewallName", - "FirewallPolicyArn", - "VpcId", - "SubnetMappings" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-networkfirewall.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::NetworkFirewall::Firewall" -} diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py index 7d0976e6c0..49dfc7f7b0 100644 --- a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py @@ -1042,6 +1042,7 @@ "alexa-ask-skill.json", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-amazonmq-broker.json", diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-acmpca-certificateauthority.json +++ /dev/null @@ -1,424 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Type", - "/properties/KeyAlgorithm", - "/properties/SigningAlgorithm", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/KeyStorageSecurityStandard", - "/properties/UsageMode" - ], - "definitions": { - "AccessDescription": { - "additionalProperties": false, - "properties": { - "AccessLocation": { - "$ref": "#/definitions/GeneralName" - }, - "AccessMethod": { - "$ref": "#/definitions/AccessMethod" - } - }, - "required": [ - "AccessMethod", - "AccessLocation" - ], - "type": "object" - }, - "AccessMethod": { - "additionalProperties": false, - "properties": { - "AccessMethodType": { - "$ref": "#/definitions/AccessMethodType" - }, - "CustomObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - } - }, - "type": "object" - }, - "AccessMethodType": { - "type": "string" - }, - "Arn": { - "type": "string" - }, - "CrlConfiguration": { - "additionalProperties": false, - "properties": { - "CrlDistributionPointExtensionConfiguration": { - "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration" - }, - "CustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - }, - "Enabled": { - "type": "boolean" - }, - "ExpirationInDays": { - "type": "integer" - }, - "S3BucketName": { - "pattern": "[-a-zA-Z0-9._/]+", - "type": "string" - }, - "S3ObjectAcl": { - "enum": [ - "BUCKET_OWNER_FULL_CONTROL", - "PUBLIC_READ" - ], - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "CrlDistributionPointExtensionConfiguration": { - "additionalProperties": false, - "properties": { - "OmitExtension": { - "type": "boolean" - } - }, - "required": [ - "OmitExtension" - ], - "type": "object" - }, - "CsrExtensions": { - "additionalProperties": false, - "properties": { - "KeyUsage": { - "$ref": "#/definitions/KeyUsage" - }, - "SubjectInformationAccess": { - "$ref": "#/definitions/SubjectInformationAccess" - } - }, - "type": "object" - }, - "CustomAttribute": { - "additionalProperties": false, - "properties": { - "ObjectIdentifier": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "ObjectIdentifier", - "Value" - ], - "type": "object" - }, - "CustomAttributeList": { - "items": { - "$ref": "#/definitions/CustomAttribute" - }, - "type": "array" - }, - "CustomObjectIdentifier": { - "type": "string" - }, - "DnsName": { - "type": "string" - }, - "EdiPartyName": { - "additionalProperties": false, - "properties": { - "NameAssigner": { - "type": "string" - }, - "PartyName": { - "type": "string" - } - }, - "required": [ - "PartyName" - ], - "type": "object" - }, - "GeneralName": { - "additionalProperties": false, - "properties": { - "DirectoryName": { - "$ref": "#/definitions/Subject" - }, - "DnsName": { - "$ref": "#/definitions/DnsName" - }, - "EdiPartyName": { - "$ref": "#/definitions/EdiPartyName" - }, - "IpAddress": { - "$ref": "#/definitions/IpAddress" - }, - "OtherName": { - "$ref": "#/definitions/OtherName" - }, - "RegisteredId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Rfc822Name": { - "$ref": "#/definitions/Rfc822Name" - }, - "UniformResourceIdentifier": { - "$ref": "#/definitions/UniformResourceIdentifier" - } - }, - "type": "object" - }, - "IpAddress": { - "type": "string" - }, - "KeyUsage": { - "additionalProperties": false, - "properties": { - "CRLSign": { - "default": false, - "type": "boolean" - }, - "DataEncipherment": { - "default": false, - "type": "boolean" - }, - "DecipherOnly": { - "default": false, - "type": "boolean" - }, - "DigitalSignature": { - "default": false, - "type": "boolean" - }, - "EncipherOnly": { - "default": false, - "type": "boolean" - }, - "KeyAgreement": { - "default": false, - "type": "boolean" - }, - "KeyCertSign": { - "default": false, - "type": "boolean" - }, - "KeyEncipherment": { - "default": false, - "type": "boolean" - }, - "NonRepudiation": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "OcspConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "type": "boolean" - }, - "OcspCustomCname": { - "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*", - "type": "string" - } - }, - "required": [ - "Enabled" - ], - "type": "object" - }, - "OtherName": { - "additionalProperties": false, - "properties": { - "TypeId": { - "$ref": "#/definitions/CustomObjectIdentifier" - }, - "Value": { - "type": "string" - } - }, - "required": [ - "TypeId", - "Value" - ], - "type": "object" - }, - "RevocationConfiguration": { - "additionalProperties": false, - "properties": { - "CrlConfiguration": { - "$ref": "#/definitions/CrlConfiguration" - }, - "OcspConfiguration": { - "$ref": "#/definitions/OcspConfiguration" - } - }, - "type": "object" - }, - "Rfc822Name": { - "type": "string" - }, - "Subject": { - "additionalProperties": false, - "properties": { - "CommonName": { - "type": "string" - }, - "Country": { - "type": "string" - }, - "CustomAttributes": { - "$ref": "#/definitions/CustomAttributeList" - }, - "DistinguishedNameQualifier": { - "type": "string" - }, - "GenerationQualifier": { - "type": "string" - }, - "GivenName": { - "type": "string" - }, - "Initials": { - "type": "string" - }, - "Locality": { - "type": "string" - }, - "Organization": { - "type": "string" - }, - "OrganizationalUnit": { - "type": "string" - }, - "Pseudonym": { - "type": "string" - }, - "SerialNumber": { - "type": "string" - }, - "State": { - "type": "string" - }, - "Surname": { - "type": "string" - }, - "Title": { - "type": "string" - } - }, - "type": "object" - }, - "SubjectInformationAccess": { - "items": { - "$ref": "#/definitions/AccessDescription" - }, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - }, - "Value": { - "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)", - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - }, - "UniformResourceIdentifier": { - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "CertificateSigningRequest": { - "type": "string" - }, - "CsrExtensions": { - "$ref": "#/definitions/CsrExtensions" - }, - "KeyAlgorithm": { - "type": "string" - }, - "KeyStorageSecurityStandard": { - "enum": [ - "CCPC_LEVEL_1_OR_HIGHER", - "FIPS_140_2_LEVEL_2_OR_HIGHER", - "FIPS_140_2_LEVEL_3_OR_HIGHER" - ], - "type": "string" - }, - "RevocationConfiguration": { - "$ref": "#/definitions/RevocationConfiguration" - }, - "SigningAlgorithm": { - "type": "string" - }, - "Subject": { - "$ref": "#/definitions/Subject" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - }, - "Type": { - "type": "string" - }, - "UsageMode": { - "enum": [ - "GENERAL_PURPOSE", - "SHORT_LIVED_CERTIFICATE" - ], - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CertificateSigningRequest" - ], - "required": [ - "Type", - "KeyAlgorithm", - "SigningAlgorithm", - "Subject" - ], - "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::ACMPCA::CertificateAuthority", - "writeOnlyProperties": [ - "/properties/Subject", - "/properties/Subject", - "/properties/CsrExtensions", - "/properties/Tags", - "/properties/RevocationConfiguration", - "/properties/KeyStorageSecurityStandard" - ] -} diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-flow.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-flow.json index 058c77b3ba..a7611aca1f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-flow.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appflow-flow.json @@ -1652,6 +1652,7 @@ "tagging": { "cloudFormationSystemTags": false, "tagOnCreate": true, + "tagProperty": "/properties/Tags", "tagUpdatable": false, "taggable": true }, 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 6d447b6039..810f4176d6 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 @@ -8,9 +8,49 @@ "/properties/EndpointType", "/properties/SecurityGroupIds", "/properties/NetworkInterfaceOptions/NetworkInterfaceId", - "/properties/LoadBalancerOptions/LoadBalancerArn" + "/properties/LoadBalancerOptions/LoadBalancerArn", + "/properties/RdsOptions/Protocol", + "/properties/RdsOptions/RdsDbInstanceArn", + "/properties/RdsOptions/RdsDbClusterArn", + "/properties/RdsOptions/RdsDbProxyArn", + "/properties/CidrOptions/Cidr", + "/properties/CidrOptions/Protocol", + "/properties/CidrOptions/SubnetIds" ], "definitions": { + "CidrOptions": { + "additionalProperties": false, + "properties": { + "Cidr": { + "type": "string" + }, + "PortRanges": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/PortRange" + }, + "type": "array", + "uniqueItems": true + }, + "Protocol": { + "enum": [ + "http", + "https", + "tcp" + ], + "type": "string" + }, + "SubnetIds": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/SubnetId" + }, + "type": "array", + "uniqueItems": true + } + }, + "type": "object" + }, "LoadBalancerOptions": { "additionalProperties": false, "properties": { @@ -22,6 +62,14 @@ "minimum": 1, "type": "integer" }, + "PortRanges": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/PortRange" + }, + "type": "array", + "uniqueItems": true + }, "Protocol": { "enum": [ "http", @@ -47,6 +95,49 @@ "NetworkInterfaceId": { "type": "string" }, + "Port": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + }, + "PortRanges": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/PortRange" + }, + "type": "array", + "uniqueItems": true + }, + "Protocol": { + "enum": [ + "http", + "https", + "tcp" + ], + "type": "string" + } + }, + "type": "object" + }, + "PortRange": { + "additionalProperties": false, + "properties": { + "FromPort": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + }, + "ToPort": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + } + }, + "type": "object" + }, + "RdsOptions": { + "additionalProperties": false, + "properties": { "Port": { "maximum": 65535, "minimum": 1, @@ -59,6 +150,26 @@ "tcp" ], "type": "string" + }, + "RdsDbClusterArn": { + "type": "string" + }, + "RdsDbInstanceArn": { + "type": "string" + }, + "RdsDbProxyArn": { + "type": "string" + }, + "RdsEndpoint": { + "type": "string" + }, + "SubnetIds": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/SubnetId" + }, + "type": "array", + "uniqueItems": true } }, "type": "object" @@ -116,6 +227,9 @@ ], "type": "string" }, + "CidrOptions": { + "$ref": "#/definitions/CidrOptions" + }, "CreationTime": { "type": "string" }, @@ -158,6 +272,9 @@ "PolicyEnabled": { "type": "boolean" }, + "RdsOptions": { + "$ref": "#/definitions/RdsOptions" + }, "SecurityGroupIds": { "format": "AWS::EC2::SecurityGroup.Ids", "insertionOrder": false, @@ -201,12 +318,9 @@ "/properties/VerifiedAccessInstanceId" ], "required": [ - "ApplicationDomain", "AttachmentType", - "DomainCertificateArn", "EndpointType", - "VerifiedAccessGroupId", - "EndpointDomainPrefix" + "VerifiedAccessGroupId" ], "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ec2-verified-access.aws-ec2-verifiedaccessendpoint", "tagging": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json index 8c476a4a37..a844db7825 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-eks-nodegroup.json @@ -113,6 +113,10 @@ "type": "number" }, "UpdateStrategy": { + "enum": [ + "DEFAULT", + "MINIMAL" + ], "type": "string" } }, diff --git a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py index 4f167fc586..1dc615c513 100644 --- a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py @@ -2316,6 +2316,7 @@ "aws-synthetics-group.json", "aws-systemsmanagersap-application.json", "aws-timestream-database.json", + "aws-timestream-influxdbinstance.json", "aws-timestream-scheduledquery.json", "aws-timestream-table.json", "aws-transfer-agreement.json", diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-timestream-influxdbinstance.json deleted file mode 100644 index bfd94ca75f..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-timestream-influxdbinstance.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Username", - "/properties/Password", - "/properties/Organization", - "/properties/Bucket", - "/properties/VpcSubnetIds", - "/properties/VpcSecurityGroupIds", - "/properties/PubliclyAccessible", - "/properties/DbStorageType", - "/properties/AllocatedStorage" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "AllocatedStorage": { - "maximum": 16384, - "minimum": 20, - "type": "integer" - }, - "Arn": { - "maxLength": 1011, - "minLength": 1, - "pattern": "^arn:aws[a-z\\-]*:timestream\\-influxdb:[a-z0-9\\-]+:[0-9]{12}:(db\\-instance)/[a-zA-Z0-9]{3,64}$", - "type": "string" - }, - "AvailabilityZone": { - "type": "string" - }, - "Bucket": { - "maxLength": 64, - "minLength": 2, - "pattern": "^[^_][^\"]*$", - "type": "string" - }, - "DbInstanceType": { - "enum": [ - "db.influx.medium", - "db.influx.large", - "db.influx.xlarge", - "db.influx.2xlarge", - "db.influx.4xlarge", - "db.influx.8xlarge", - "db.influx.12xlarge", - "db.influx.16xlarge" - ], - "type": "string" - }, - "DbParameterGroupIdentifier": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "DbStorageType": { - "enum": [ - "InfluxIOIncludedT1", - "InfluxIOIncludedT2", - "InfluxIOIncludedT3" - ], - "type": "string" - }, - "DeploymentType": { - "enum": [ - "SINGLE_AZ", - "WITH_MULTIAZ_STANDBY" - ], - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "Id": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "InfluxAuthParametersSecretArn": { - "pattern": "^arn:[a-z]*:secretsmanager:[a-z\\-0-9]*:[0-9]*:secret:[a-zA-Z0-9\\-]*", - "type": "string" - }, - "LogDeliveryConfiguration": { - "additionalProperties": false, - "properties": { - "S3Configuration": { - "additionalProperties": false, - "properties": { - "BucketName": { - "maxLength": 63, - "minLength": 3, - "pattern": "^[0-9a-z]+[0-9a-z\\.\\-]*[0-9a-z]+$", - "type": "string" - }, - "Enabled": { - "type": "boolean" - } - }, - "required": [ - "Enabled", - "BucketName" - ], - "type": "object" - } - }, - "required": [ - "S3Configuration" - ], - "type": "object" - }, - "Name": { - "maxLength": 40, - "minLength": 3, - "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", - "type": "string" - }, - "Organization": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "Password": { - "maxLength": 64, - "minLength": 8, - "pattern": "^[a-zA-Z0-9]+$", - "type": "string" - }, - "Port": { - "maximum": 65535, - "minimum": 1024, - "type": "integer" - }, - "PubliclyAccessible": { - "default": false, - "type": "boolean" - }, - "SecondaryAvailabilityZone": { - "type": "string" - }, - "Status": { - "enum": [ - "CREATING", - "AVAILABLE", - "DELETING", - "MODIFYING", - "UPDATING", - "UPDATING_DEPLOYMENT_TYPE", - "UPDATING_INSTANCE_TYPE", - "DELETED", - "FAILED" - ], - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 200, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "Username": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "VpcSecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "maxItems": 5, - "minItems": 1, - "type": "array" - }, - "VpcSubnetIds": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "maxItems": 3, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Status", - "/properties/Arn", - "/properties/Id", - "/properties/AvailabilityZone", - "/properties/Endpoint", - "/properties/SecondaryAvailabilityZone", - "/properties/InfluxAuthParametersSecretArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::Timestream::InfluxDBInstance", - "writeOnlyProperties": [ - "/properties/Username", - "/properties/Password", - "/properties/Organization", - "/properties/Bucket" - ] -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py b/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py index 735a36e37e..346cda2e4c 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py @@ -942,7 +942,6 @@ "aws-ec2-transitgatewayroutetableassociation.json", "aws-ec2-transitgatewayroutetablepropagation.json", "aws-ec2-transitgatewayvpcattachment.json", - "aws-ec2-verifiedaccessendpoint.json", "aws-ec2-verifiedaccessgroup.json", "aws-ec2-volume.json", "aws-ec2-vpc.json", diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-verifiedaccessendpoint.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-verifiedaccessendpoint.json new file mode 100644 index 0000000000..6d447b6039 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-verifiedaccessendpoint.json @@ -0,0 +1,220 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/ApplicationDomain", + "/properties/AttachmentType", + "/properties/DomainCertificateArn", + "/properties/EndpointDomainPrefix", + "/properties/EndpointType", + "/properties/SecurityGroupIds", + "/properties/NetworkInterfaceOptions/NetworkInterfaceId", + "/properties/LoadBalancerOptions/LoadBalancerArn" + ], + "definitions": { + "LoadBalancerOptions": { + "additionalProperties": false, + "properties": { + "LoadBalancerArn": { + "type": "string" + }, + "Port": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + }, + "Protocol": { + "enum": [ + "http", + "https", + "tcp" + ], + "type": "string" + }, + "SubnetIds": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/SubnetId" + }, + "type": "array", + "uniqueItems": true + } + }, + "type": "object" + }, + "NetworkInterfaceOptions": { + "additionalProperties": false, + "properties": { + "NetworkInterfaceId": { + "type": "string" + }, + "Port": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + }, + "Protocol": { + "enum": [ + "http", + "https", + "tcp" + ], + "type": "string" + } + }, + "type": "object" + }, + "SecurityGroupId": { + "format": "AWS::EC2::SecurityGroup.Id", + "type": "string" + }, + "SseSpecification": { + "additionalProperties": false, + "properties": { + "CustomerManagedKeyEnabled": { + "type": "boolean" + }, + "KmsKeyArn": { + "type": "string" + } + }, + "type": "object" + }, + "SubnetId": { + "type": "string" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/VerifiedAccessEndpointId" + ], + "properties": { + "ApplicationDomain": { + "type": "string" + }, + "AttachmentType": { + "enum": [ + "vpc" + ], + "type": "string" + }, + "CreationTime": { + "type": "string" + }, + "Description": { + "type": "string" + }, + "DeviceValidationDomain": { + "type": "string" + }, + "DomainCertificateArn": { + "type": "string" + }, + "EndpointDomain": { + "type": "string" + }, + "EndpointDomainPrefix": { + "type": "string" + }, + "EndpointType": { + "enum": [ + "cidr", + "load-balancer", + "network-interface", + "rds" + ], + "type": "string" + }, + "LastUpdatedTime": { + "type": "string" + }, + "LoadBalancerOptions": { + "$ref": "#/definitions/LoadBalancerOptions" + }, + "NetworkInterfaceOptions": { + "$ref": "#/definitions/NetworkInterfaceOptions" + }, + "PolicyDocument": { + "type": "string" + }, + "PolicyEnabled": { + "type": "boolean" + }, + "SecurityGroupIds": { + "format": "AWS::EC2::SecurityGroup.Ids", + "insertionOrder": false, + "items": { + "$ref": "#/definitions/SecurityGroupId" + }, + "type": "array", + "uniqueItems": true + }, + "SseSpecification": { + "$ref": "#/definitions/SseSpecification" + }, + "Status": { + "type": "string" + }, + "Tags": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": true + }, + "VerifiedAccessEndpointId": { + "type": "string" + }, + "VerifiedAccessGroupId": { + "type": "string" + }, + "VerifiedAccessInstanceId": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/VerifiedAccessEndpointId", + "/properties/EndpointDomain", + "/properties/CreationTime", + "/properties/LastUpdatedTime", + "/properties/Status", + "/properties/DeviceValidationDomain", + "/properties/VerifiedAccessInstanceId" + ], + "required": [ + "ApplicationDomain", + "AttachmentType", + "DomainCertificateArn", + "EndpointType", + "VerifiedAccessGroupId", + "EndpointDomainPrefix" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ec2-verified-access.aws-ec2-verifiedaccessendpoint", + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::EC2::VerifiedAccessEndpoint" +} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py b/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py index 90a64944c9..854e92f6f6 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py @@ -1101,7 +1101,6 @@ "aws-ec2-transitgatewayroutetableassociation.json", "aws-ec2-transitgatewayroutetablepropagation.json", "aws-ec2-transitgatewayvpcattachment.json", - "aws-ec2-verifiedaccessendpoint.json", "aws-ec2-verifiedaccessgroup.json", "aws-ec2-volume.json", "aws-ec2-vpc.json", @@ -1521,6 +1520,9 @@ "aws-stepfunctions-statemachineversion.json", "aws-synthetics-canary.json", "aws-synthetics-group.json", + "aws-timestream-database.json", + "aws-timestream-scheduledquery.json", + "aws-timestream-table.json", "aws-transfer-agreement.json", "aws-transfer-certificate.json", "aws-transfer-connector.json", diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-verifiedaccessendpoint.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-verifiedaccessendpoint.json new file mode 100644 index 0000000000..6d447b6039 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-verifiedaccessendpoint.json @@ -0,0 +1,220 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/ApplicationDomain", + "/properties/AttachmentType", + "/properties/DomainCertificateArn", + "/properties/EndpointDomainPrefix", + "/properties/EndpointType", + "/properties/SecurityGroupIds", + "/properties/NetworkInterfaceOptions/NetworkInterfaceId", + "/properties/LoadBalancerOptions/LoadBalancerArn" + ], + "definitions": { + "LoadBalancerOptions": { + "additionalProperties": false, + "properties": { + "LoadBalancerArn": { + "type": "string" + }, + "Port": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + }, + "Protocol": { + "enum": [ + "http", + "https", + "tcp" + ], + "type": "string" + }, + "SubnetIds": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/SubnetId" + }, + "type": "array", + "uniqueItems": true + } + }, + "type": "object" + }, + "NetworkInterfaceOptions": { + "additionalProperties": false, + "properties": { + "NetworkInterfaceId": { + "type": "string" + }, + "Port": { + "maximum": 65535, + "minimum": 1, + "type": "integer" + }, + "Protocol": { + "enum": [ + "http", + "https", + "tcp" + ], + "type": "string" + } + }, + "type": "object" + }, + "SecurityGroupId": { + "format": "AWS::EC2::SecurityGroup.Id", + "type": "string" + }, + "SseSpecification": { + "additionalProperties": false, + "properties": { + "CustomerManagedKeyEnabled": { + "type": "boolean" + }, + "KmsKeyArn": { + "type": "string" + } + }, + "type": "object" + }, + "SubnetId": { + "type": "string" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/VerifiedAccessEndpointId" + ], + "properties": { + "ApplicationDomain": { + "type": "string" + }, + "AttachmentType": { + "enum": [ + "vpc" + ], + "type": "string" + }, + "CreationTime": { + "type": "string" + }, + "Description": { + "type": "string" + }, + "DeviceValidationDomain": { + "type": "string" + }, + "DomainCertificateArn": { + "type": "string" + }, + "EndpointDomain": { + "type": "string" + }, + "EndpointDomainPrefix": { + "type": "string" + }, + "EndpointType": { + "enum": [ + "cidr", + "load-balancer", + "network-interface", + "rds" + ], + "type": "string" + }, + "LastUpdatedTime": { + "type": "string" + }, + "LoadBalancerOptions": { + "$ref": "#/definitions/LoadBalancerOptions" + }, + "NetworkInterfaceOptions": { + "$ref": "#/definitions/NetworkInterfaceOptions" + }, + "PolicyDocument": { + "type": "string" + }, + "PolicyEnabled": { + "type": "boolean" + }, + "SecurityGroupIds": { + "format": "AWS::EC2::SecurityGroup.Ids", + "insertionOrder": false, + "items": { + "$ref": "#/definitions/SecurityGroupId" + }, + "type": "array", + "uniqueItems": true + }, + "SseSpecification": { + "$ref": "#/definitions/SseSpecification" + }, + "Status": { + "type": "string" + }, + "Tags": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": true + }, + "VerifiedAccessEndpointId": { + "type": "string" + }, + "VerifiedAccessGroupId": { + "type": "string" + }, + "VerifiedAccessInstanceId": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/VerifiedAccessEndpointId", + "/properties/EndpointDomain", + "/properties/CreationTime", + "/properties/LastUpdatedTime", + "/properties/Status", + "/properties/DeviceValidationDomain", + "/properties/VerifiedAccessInstanceId" + ], + "required": [ + "ApplicationDomain", + "AttachmentType", + "DomainCertificateArn", + "EndpointType", + "VerifiedAccessGroupId", + "EndpointDomainPrefix" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ec2-verified-access.aws-ec2-verifiedaccessendpoint", + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::EC2::VerifiedAccessEndpoint" +} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-database.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-database.json deleted file mode 100644 index 1b75d0d484..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-database.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DatabaseName" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/DatabaseName" - ], - "properties": { - "Arn": { - "type": "string" - }, - "DatabaseName": { - "pattern": "^[a-zA-Z0-9_.-]{3,256}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "minLength": 1, - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 200, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git", - "typeName": "AWS::Timestream::Database" -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-scheduledquery.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-scheduledquery.json deleted file mode 100644 index 167de59178..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-scheduledquery.json +++ /dev/null @@ -1,459 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ScheduledQueryName", - "/properties/QueryString", - "/properties/ScheduleConfiguration", - "/properties/NotificationConfiguration", - "/properties/ClientToken", - "/properties/ScheduledQueryExecutionRoleArn", - "/properties/TargetConfiguration", - "/properties/ErrorReportConfiguration", - "/properties/KmsKeyId" - ], - "definitions": { - "Arn": { - "maxLength": 2048, - "minLength": 1, - "type": "string" - }, - "BucketName": { - "maxLength": 63, - "minLength": 3, - "pattern": "[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]", - "type": "string" - }, - "ClientToken": { - "maxLength": 128, - "minLength": 32, - "type": "string" - }, - "DatabaseName": { - "type": "string" - }, - "DimensionMapping": { - "additionalProperties": false, - "properties": { - "DimensionValueType": { - "$ref": "#/definitions/DimensionValueType" - }, - "Name": { - "$ref": "#/definitions/DimensionMappingName" - } - }, - "required": [ - "Name", - "DimensionValueType" - ], - "type": "object" - }, - "DimensionMappingName": { - "type": "string" - }, - "DimensionMappings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/DimensionMapping" - }, - "type": "array" - }, - "DimensionValueType": { - "enum": [ - "VARCHAR" - ], - "type": "string" - }, - "EncryptionOption": { - "enum": [ - "SSE_S3", - "SSE_KMS" - ], - "type": "string" - }, - "ErrorReportConfiguration": { - "additionalProperties": false, - "properties": { - "S3Configuration": { - "$ref": "#/definitions/S3Configuration" - } - }, - "required": [ - "S3Configuration" - ], - "type": "object" - }, - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "minLength": 1, - "type": "string" - }, - "MeasureNameColumn": { - "type": "string" - }, - "MixedMeasureMapping": { - "additionalProperties": false, - "properties": { - "MeasureName": { - "$ref": "#/definitions/MixedMeasureMappingMeasureName" - }, - "MeasureValueType": { - "$ref": "#/definitions/MixedMeasureMappingMeasureValueType" - }, - "MultiMeasureAttributeMappings": { - "$ref": "#/definitions/MultiMeasureAttributeMappingList" - }, - "SourceColumn": { - "$ref": "#/definitions/MixedMeasureMappingSourceColumn" - }, - "TargetMeasureName": { - "$ref": "#/definitions/MixedMeasureMappingTargetMeasureName" - } - }, - "required": [ - "MeasureValueType" - ], - "type": "object" - }, - "MixedMeasureMappingMeasureName": { - "type": "string" - }, - "MixedMeasureMappingMeasureValueType": { - "enum": [ - "BIGINT", - "BOOLEAN", - "DOUBLE", - "VARCHAR", - "MULTI" - ], - "type": "string" - }, - "MixedMeasureMappingSourceColumn": { - "type": "string" - }, - "MixedMeasureMappingTargetMeasureName": { - "type": "string" - }, - "MixedMeasureMappings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/MixedMeasureMapping" - }, - "minItems": 1, - "type": "array" - }, - "MultiMeasureAttributeMapping": { - "additionalProperties": false, - "properties": { - "MeasureValueType": { - "$ref": "#/definitions/MultiMeasureAttributeMappingMeasureValueType" - }, - "SourceColumn": { - "$ref": "#/definitions/MultiMeasureAttributeMappingSourceColumn" - }, - "TargetMultiMeasureAttributeName": { - "$ref": "#/definitions/TargetMultiMeasureAttributeName" - } - }, - "required": [ - "SourceColumn", - "MeasureValueType" - ], - "type": "object" - }, - "MultiMeasureAttributeMappingList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/MultiMeasureAttributeMapping" - }, - "minItems": 1, - "type": "array" - }, - "MultiMeasureAttributeMappingMeasureValueType": { - "enum": [ - "BIGINT", - "BOOLEAN", - "DOUBLE", - "VARCHAR", - "TIMESTAMP" - ], - "type": "string" - }, - "MultiMeasureAttributeMappingSourceColumn": { - "type": "string" - }, - "MultiMeasureMappings": { - "additionalProperties": false, - "properties": { - "MultiMeasureAttributeMappings": { - "$ref": "#/definitions/MultiMeasureAttributeMappingList" - }, - "TargetMultiMeasureName": { - "$ref": "#/definitions/TargetMultiMeasureName" - } - }, - "required": [ - "MultiMeasureAttributeMappings" - ], - "type": "object" - }, - "NotificationConfiguration": { - "additionalProperties": false, - "properties": { - "SnsConfiguration": { - "$ref": "#/definitions/SnsConfiguration" - } - }, - "required": [ - "SnsConfiguration" - ], - "type": "object" - }, - "ObjectKeyPrefix": { - "maxLength": 896, - "minLength": 1, - "pattern": "[a-zA-Z0-9|!\\-_*'\\(\\)]([a-zA-Z0-9]|[!\\-_*'\\(\\)\\/.])+", - "type": "string" - }, - "QueryString": { - "maxLength": 262144, - "minLength": 1, - "type": "string" - }, - "S3Configuration": { - "additionalProperties": false, - "properties": { - "BucketName": { - "$ref": "#/definitions/BucketName" - }, - "EncryptionOption": { - "$ref": "#/definitions/EncryptionOption" - }, - "ObjectKeyPrefix": { - "$ref": "#/definitions/ObjectKeyPrefix" - } - }, - "required": [ - "BucketName" - ], - "type": "object" - }, - "ScheduleConfiguration": { - "additionalProperties": false, - "properties": { - "ScheduleExpression": { - "$ref": "#/definitions/ScheduleExpression" - } - }, - "required": [ - "ScheduleExpression" - ], - "type": "object" - }, - "ScheduleExpression": { - "maxLength": 256, - "minLength": 1, - "type": "string" - }, - "ScheduledQueryExecutionRoleArn": { - "maxLength": 2048, - "minLength": 1, - "type": "string" - }, - "ScheduledQueryName": { - "maxLength": 64, - "minLength": 1, - "pattern": "[a-zA-Z0-9_.-]+", - "type": "string" - }, - "SnsConfiguration": { - "additionalProperties": false, - "properties": { - "TopicArn": { - "$ref": "#/definitions/TopicArn" - } - }, - "required": [ - "TopicArn" - ], - "type": "object" - }, - "TableName": { - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "$ref": "#/definitions/Key" - }, - "Value": { - "$ref": "#/definitions/Value" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 200, - "type": "array" - }, - "TargetConfiguration": { - "additionalProperties": false, - "properties": { - "TimestreamConfiguration": { - "$ref": "#/definitions/TimestreamConfiguration" - } - }, - "required": [ - "TimestreamConfiguration" - ], - "type": "object" - }, - "TargetMultiMeasureAttributeName": { - "type": "string" - }, - "TargetMultiMeasureName": { - "type": "string" - }, - "TimeColumn": { - "type": "string" - }, - "TimestreamConfiguration": { - "additionalProperties": false, - "properties": { - "DatabaseName": { - "$ref": "#/definitions/DatabaseName" - }, - "DimensionMappings": { - "$ref": "#/definitions/DimensionMappings" - }, - "MeasureNameColumn": { - "$ref": "#/definitions/MeasureNameColumn" - }, - "MixedMeasureMappings": { - "$ref": "#/definitions/MixedMeasureMappings" - }, - "MultiMeasureMappings": { - "$ref": "#/definitions/MultiMeasureMappings" - }, - "TableName": { - "$ref": "#/definitions/TableName" - }, - "TimeColumn": { - "$ref": "#/definitions/TimeColumn" - } - }, - "required": [ - "DatabaseName", - "TableName", - "TimeColumn", - "DimensionMappings" - ], - "type": "object" - }, - "TopicArn": { - "maxLength": 2048, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/Arn" - }, - "ClientToken": { - "$ref": "#/definitions/ClientToken" - }, - "ErrorReportConfiguration": { - "$ref": "#/definitions/ErrorReportConfiguration" - }, - "KmsKeyId": { - "$ref": "#/definitions/KmsKeyId" - }, - "NotificationConfiguration": { - "$ref": "#/definitions/NotificationConfiguration" - }, - "QueryString": { - "$ref": "#/definitions/QueryString" - }, - "SQErrorReportConfiguration": { - "type": "string" - }, - "SQKmsKeyId": { - "type": "string" - }, - "SQName": { - "type": "string" - }, - "SQNotificationConfiguration": { - "type": "string" - }, - "SQQueryString": { - "type": "string" - }, - "SQScheduleConfiguration": { - "type": "string" - }, - "SQScheduledQueryExecutionRoleArn": { - "type": "string" - }, - "SQTargetConfiguration": { - "type": "string" - }, - "ScheduleConfiguration": { - "$ref": "#/definitions/ScheduleConfiguration" - }, - "ScheduledQueryExecutionRoleArn": { - "$ref": "#/definitions/ScheduledQueryExecutionRoleArn" - }, - "ScheduledQueryName": { - "$ref": "#/definitions/ScheduledQueryName" - }, - "Tags": { - "$ref": "#/definitions/Tags" - }, - "TargetConfiguration": { - "$ref": "#/definitions/TargetConfiguration" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/SQName", - "/properties/SQQueryString", - "/properties/SQScheduleConfiguration", - "/properties/SQNotificationConfiguration", - "/properties/SQScheduledQueryExecutionRoleArn", - "/properties/SQTargetConfiguration", - "/properties/SQErrorReportConfiguration", - "/properties/SQKmsKeyId" - ], - "required": [ - "QueryString", - "ScheduleConfiguration", - "NotificationConfiguration", - "ScheduledQueryExecutionRoleArn", - "ErrorReportConfiguration" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git", - "typeName": "AWS::Timestream::ScheduledQuery" -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-table.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-table.json deleted file mode 100644 index bc876a009a..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-table.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DatabaseName", - "/properties/TableName" - ], - "definitions": { - "PartitionKey": { - "additionalProperties": false, - "properties": { - "EnforcementInRecord": { - "$ref": "#/definitions/PartitionKeyEnforcementLevel" - }, - "Name": { - "$ref": "#/definitions/SchemaName" - }, - "Type": { - "$ref": "#/definitions/PartitionKeyType" - } - }, - "required": [ - "Type" - ], - "type": "object" - }, - "PartitionKeyEnforcementLevel": { - "enum": [ - "REQUIRED", - "OPTIONAL" - ], - "type": "string" - }, - "PartitionKeyList": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PartitionKey" - }, - "minItems": 1, - "type": "array" - }, - "PartitionKeyType": { - "enum": [ - "DIMENSION", - "MEASURE" - ], - "type": "string" - }, - "SchemaName": { - "maxLength": 2048, - "minLength": 1, - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/DatabaseName", - "/properties/TableName" - ], - "properties": { - "Arn": { - "type": "string" - }, - "DatabaseName": { - "pattern": "^[a-zA-Z0-9_.-]{3,256}$", - "type": "string" - }, - "MagneticStoreWriteProperties": { - "additionalProperties": false, - "properties": { - "EnableMagneticStoreWrites": { - "type": "boolean" - }, - "MagneticStoreRejectedDataLocation": { - "additionalProperties": false, - "properties": { - "S3Configuration": { - "additionalProperties": false, - "properties": { - "BucketName": { - "type": "string" - }, - "EncryptionOption": { - "type": "string" - }, - "KmsKeyId": { - "type": "string" - }, - "ObjectKeyPrefix": { - "type": "string" - } - }, - "required": [ - "EncryptionOption", - "BucketName" - ], - "type": "object" - } - }, - "type": "object" - } - }, - "required": [ - "EnableMagneticStoreWrites" - ], - "type": "object" - }, - "Name": { - "type": "string" - }, - "RetentionProperties": { - "additionalProperties": false, - "properties": { - "MagneticStoreRetentionPeriodInDays": { - "type": "string" - }, - "MemoryStoreRetentionPeriodInHours": { - "type": "string" - } - }, - "type": "object" - }, - "Schema": { - "additionalProperties": false, - "properties": { - "CompositePartitionKey": { - "$ref": "#/definitions/PartitionKeyList" - } - }, - "type": "object" - }, - "TableName": { - "pattern": "^[a-zA-Z0-9_.-]{3,256}$", - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 200, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Name" - ], - "required": [ - "DatabaseName" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git", - "typeName": "AWS::Timestream::Table" -} diff --git a/src/cfnlint/data/schemas/providers/us_west_2/__init__.py b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py index e5aba92d6c..6c8663905d 100644 --- a/src/cfnlint/data/schemas/providers/us_west_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py @@ -210,6 +210,7 @@ "AWS::CloudFront::RealtimeLogConfig", "AWS::CloudFront::ResponseHeadersPolicy", "AWS::CloudFront::StreamingDistribution", + "AWS::CloudFront::VpcOrigin", "AWS::CloudTrail::Channel", "AWS::CloudTrail::Dashboard", "AWS::CloudTrail::EventDataStore", diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json new file mode 100644 index 0000000000..80909b40c9 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json @@ -0,0 +1,108 @@ +{ + "additionalProperties": false, + "definitions": { + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "type": "string" + }, + "Value": { + "type": "string" + } + }, + "required": [ + "Value", + "Key" + ], + "type": "object" + }, + "VpcOriginEndpointConfig": { + "additionalProperties": false, + "properties": { + "Arn": { + "type": "string" + }, + "HTTPPort": { + "default": 80, + "type": "integer" + }, + "HTTPSPort": { + "default": 443, + "type": "integer" + }, + "Name": { + "type": "string" + }, + "OriginProtocolPolicy": { + "default": "match-viewer", + "type": "string" + }, + "OriginSSLProtocols": { + "default": [ + "TLSv1", + "SSLv3" + ], + "items": { + "type": "string" + }, + "type": "array", + "uniqueItems": false + } + }, + "required": [ + "Name", + "Arn" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/Id" + ], + "properties": { + "Arn": { + "type": "string" + }, + "CreatedTime": { + "type": "string" + }, + "Id": { + "type": "string" + }, + "LastModifiedTime": { + "type": "string" + }, + "Status": { + "type": "string" + }, + "Tags": { + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": false + }, + "VpcOriginEndpointConfig": { + "$ref": "#/definitions/VpcOriginEndpointConfig" + } + }, + "readOnlyProperties": [ + "/properties/Id", + "/properties/Arn", + "/properties/Status", + "/properties/CreatedTime", + "/properties/LastModifiedTime" + ], + "required": [ + "VpcOriginEndpointConfig" + ], + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::CloudFront::VpcOrigin" +}