diff --git a/docs/format_keyword.md b/docs/format_keyword.md index 20b016ed22..a6d68b6dc0 100644 --- a/docs/format_keyword.md +++ b/docs/format_keyword.md @@ -14,15 +14,19 @@ This format ensures that the value is a valid VPC ID, which is a string of the p ### AWS::EC2::SecurityGroup.Id -This format validates that the value is a valid Security Group ID, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`. +This format validates that the value is a valid security group ID, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`. ### AWS::EC2::SecurityGroup.Ids -This format validates that the value is a valid list of Security Group IDs, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`. +This format validates that the value is a valid list of security group IDs, which is a string of the pattern `sg-[0-9a-f]{8}` or `sg-[0-9a-f]{17}`. ### AWS::EC2::SecurityGroup.Name -This format validates that the value is a valid Security Group Name, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters. +This format validates that the value is a valid security group name, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters. + +### AWS::EC2::SecurityGroup.Names + +This format validates that the value is a valid list of security group names, which must be a string of 1 to 255 characters, starting with a letter, and containing only letters, numbers, and certain special characters. ### AWS::EC2::Image.Id diff --git a/scripts/update_schemas_format.py b/scripts/update_schemas_format.py index fbf65c6ffa..cadc0c366f 100755 --- a/scripts/update_schemas_format.py +++ b/scripts/update_schemas_format.py @@ -66,7 +66,11 @@ def _create_subnet_ids_patch(type_name: str, ref: str, resolver: RefResolver): def _create_security_group_ids_patch(type_name: str, ref: str, resolver: RefResolver): - if type_name in ["AWS::Pipes::Pipe", "AWS::EC2::NetworkInsightsAnalysis"]: + if type_name in [ + "AWS::Pipes::Pipe", + "AWS::EC2::NetworkInsightsAnalysis", + "AWS::AutoScaling::LaunchConfiguration", + ]: return [] _, resolved = resolver.resolve(ref) @@ -181,6 +185,26 @@ def _create_patch(value: dict[str, str], ref: Sequence[str], resolver: RefResolv path="/properties/GroupId", ), ], + "AWS::AutoScaling::LaunchConfiguration": [ + Patch( + values={ + "anyOf": [ + {"format": "AWS::EC2::SecurityGroup.Ids"}, + {"format": "AWS::EC2::SecurityGroup.Names"}, + ] + }, + path="/properties/SecurityGroups", + ), + Patch( + values={ + "anyOf": [ + {"format": "AWS::EC2::SecurityGroup.Id"}, + {"format": "AWS::EC2::SecurityGroup.Name"}, + ] + }, + path="/properties/SecurityGroups/items", + ), + ], } @@ -256,7 +280,6 @@ def main(): obj, [ "CustomSecurityGroupIds", - "DBSecurityGroups", "Ec2SecurityGroupIds", "GroupSet", "InputSecurityGroups", @@ -282,7 +305,7 @@ def main(): "EC2SecurityGroupId", "SecurityGroup", "SecurityGroupId", - "SecurityGroupIngress" "SourceSecurityGroupId", + "SourceSecurityGroupId", "VpcSecurityGroupId", ], ): @@ -298,9 +321,8 @@ def main(): [ "CacheSecurityGroupName", "ClusterSecurityGroupName", - "DBSecurityGroupName", "EC2SecurityGroupName", - "SourceSecurityGroupName" "SourceSecurityGroupName", + "SourceSecurityGroupName", ], ): if path[-2] == "properties": diff --git a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json index c062034f37..4d4a06a053 100644 --- a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json @@ -1 +1 @@ -{"etag": "\"40a213aff984b3807375de209bb3bc6c\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"91791f53d414564db7cbbceaefd59f7a\"", "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 b35e277db3..1b28c114e2 100644 --- a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json @@ -1 +1 @@ -{"etag": "\"eb4395911f52bbbb03124419ba1b9ccd\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"} +{"etag": "\"1d368feb392c9238293424f22c4ffecd\"", "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 58365f638f..2fdf8932c5 100644 --- a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json @@ -1 +1 @@ -{"etag": "\"ee190d033b93053467912ceba1f634fa\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"fcc739d65ac9611f3ae58889b5ed1dc4\"", "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 acebc75669..3243b46a3c 100644 --- a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json @@ -1 +1 @@ -{"etag": "\"86d631145410662623cf0520b230c5d4\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"436de8b4c9c2dee7797804b5df85d5b9\"", "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 7590a52ab1..2888f980e7 100644 --- a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json @@ -1 +1 @@ -{"etag": "\"5d466585bd04bb49223e7c7af41512be\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"221c4d1a9d10c9315e0ec8587dbea986\"", "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 e7ea892b7f..007475100a 100644 --- a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json @@ -1 +1 @@ -{"etag": "\"c7256740190e7d5bd5f4675305a4bf6e\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"0cbc4482c76af92fbc6eea221cdb9c98\"", "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 ae57a4ee62..fe12093365 100644 --- a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json @@ -1 +1 @@ -{"etag": "\"cc91450d991f3b98e80d7ae3a396d243\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"c823754c9178a7fafa1bed463c372d89\"", "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 d227a0e0e2..a501c062e1 100644 --- a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json @@ -1 +1 @@ -{"etag": "\"8714f0418f6643de9580f2e975741334\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"} +{"etag": "\"c7a1f96603c2f7c761969d8e74de566e\"", "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 986e07fca3..a2e4729157 100644 --- a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json @@ -1 +1 @@ -{"etag": "\"05a2935e5783359150b442e6b54a5f04\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"590e86f2a1e3385fea04ad561fddb9c1\"", "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 6b9bc26c51..c12c4ea621 100644 --- a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json @@ -1 +1 @@ -{"etag": "\"b285f9c337046a431f1d441d40d2af23\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"4f4207eee4a69ce7239383cdfd6a9f5d\"", "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 74152fcd4e..b769d34340 100644 --- a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json @@ -1 +1 @@ -{"etag": "\"fe5cfbe54570dd0eeabe1449257d794d\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"dee69b39f5065715f44431593be4a8fb\"", "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 66cdf3b311..c9209a5e36 100644 --- a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json @@ -1 +1 @@ -{"etag": "\"e67e8c5978bcf756b3e8d9e2a863204c\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"25561abddab9670c6847decaea2cee17\"", "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 c08c697466..6f53e43f99 100644 --- a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json @@ -1 +1 @@ -{"etag": "\"5632be4bf7daac191f555cdaddbab019\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"c83e911c87a4d3c34e01c983af9c9eef\"", "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 dfb482dea3..74db9c3a61 100644 --- a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json @@ -1 +1 @@ -{"etag": "\"37c6ee8b69f2a1eb8d2cb16bdca7a147\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"3edf4bb213b2ce927ac0f081ca07bee3\"", "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 aa0ece7473..d97cc1a602 100644 --- a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json @@ -1 +1 @@ -{"etag": "\"9cf3c8b54e1cd4c73cd269d293a762e8\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"a6ad2713dee9133b83f0a84a30cf0438\"", "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 e672946f21..744af0a45d 100644 --- a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json @@ -1 +1 @@ -{"etag": "\"39c9ca732b0c3abc8fae0203af388e06\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"8e7a8e4d44d86c36bd47803e6b216d90\"", "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 57abff3cf3..c0e44cf858 100644 --- a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json @@ -1 +1 @@ -{"etag": "\"f57ba55d8370b1856af2d1ad9ee237af\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"71c1b7578d6b772fb2554f5e9609d056\"", "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 5f25b2c179..14e237979f 100644 --- a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json @@ -1 +1 @@ -{"etag": "\"142fe3d6118844cad68dac990849c77a\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"fab8df43535ac3b0a078a018a5201cf9\"", "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 f62bf812f9..0b27a0d04b 100644 --- a/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json @@ -1 +1 @@ -{"etag": "\"2ad314d9019a7e1e560699e05cc27738\"", "url": "https://schema.cloudformation.ap-southeast-7.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"782358bbfb4f85f297e01b7d96ab058b\"", "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 bfb563fc2e..dbfca61a49 100644 --- a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json @@ -1 +1 @@ -{"etag": "\"d5d90be31824a0feee2777093e487925\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"4fa7e32211cad343b7554dcd4aa5115f\"", "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 1229fa6118..faa49cb865 100644 --- a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json @@ -1 +1 @@ -{"etag": "\"5fe6eb2452a1c9099e355fe33f2a026e\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"acd24b3c720250c5322f1fd431bdd8a6\"", "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 7802e64b40..784533abaf 100644 --- a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json @@ -1 +1 @@ -{"etag": "\"652c1b3ff2650cca0c3e87d079ab8952\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"8c3c26295c12d5fd0768fe25b0e23704\"", "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 05f3f21780..9acb43d364 100644 --- a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json @@ -1 +1 @@ -{"etag": "\"096287bae86748364be5f2b0b7e3840e\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"f6dc3aefe61ba028746825c07904d9f8\"", "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 8c33c58d6a..a97e413b3c 100644 --- a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json @@ -1 +1 @@ -{"etag": "\"741c427f1967b5f52480f8c95ec3adf6\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"573c4d96761e48ad0bde544742d8e494\"", "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 94ed7b0dc5..d1151c28fb 100644 --- a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json @@ -1 +1 @@ -{"etag": "\"69e685e22df2aa7744642da364e15348\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"76f411d041441e0593a4c4fd2b454e0a\"", "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 59b5067d1b..3d7c6d718e 100644 --- a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json @@ -1 +1 @@ -{"etag": "\"bccb07634cc10320de4f9ea196706c6d\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"803b6cb7c9af8e7ead19a14efc475e68\"", "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 4d1b58b77e..0b8ebf75d3 100644 --- a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json @@ -1 +1 @@ -{"etag": "\"caca23482a63315b3845fe4853b4a2b7\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"79d8af5b8b8146526af29619358b73ee\"", "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 943e8d9b75..6d336c4f90 100644 --- a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json @@ -1 +1 @@ -{"etag": "\"9bb91389938202d97678c7f05c7aa487\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"60c9690c517de5cb59a41ed5d867c1fb\"", "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 925b174bdb..48170840b5 100644 --- a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json @@ -1 +1 @@ -{"etag": "\"ff9a5a488b992946f2e81f4b7d87c962\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"08a79e162a116588e6d2ecae02d26d7b\"", "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 0a96f678ad..ca64deaaef 100644 --- a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json @@ -1 +1 @@ -{"etag": "\"b379888879967a218e0a7f097baa00ad\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"a8a861b985be8d64ea710c622ff8713b\"", "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 0936c7eb34..ee70f02a95 100644 --- a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json @@ -1 +1 @@ -{"etag": "\"457ebb6f84034d751e1dfa63ffd06bf2\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"5146f2790da5ca092889ae7e938ab15e\"", "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 2d08da39e8..1cd4f8e795 100644 --- a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json @@ -1 +1 @@ -{"etag": "\"64f494033b7dff8a4949689d6dabc425\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"d6523eaa0ebe6391b66fdb5e6a53c2f5\"", "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 815c3c41bb..b5b48a6681 100644 --- a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json @@ -1 +1 @@ -{"etag": "\"f355de13bcbfc33284deacdd006f807c\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"6648106b37560fe53b0ad16ade488048\"", "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 281f14ea00..a19f163f5f 100644 --- a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json @@ -1 +1 @@ -{"etag": "\"1fa555169a872eae4f4a00d05f48379f\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"452d03cdc679fe474f5d1103c48c3c1a\"", "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 407c045143..df947a0c35 100644 --- a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json @@ -1 +1 @@ -{"etag": "\"55484435bd4477aea5738b45d8538baa\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"08eb30332494d51ce03c5ca2ba8ad3f7\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json index 5ace751082..d91a9f12e6 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_autoscaling_launchconfiguration/format.json @@ -1,17 +1,31 @@ [ { "op": "add", - "path": "/properties/ImageId/format", - "value": "AWS::EC2::Image.Id" + "path": "/properties/SecurityGroups/anyOf", + "value": [ + { + "format": "AWS::EC2::SecurityGroup.Id" + }, + { + "format": "AWS::EC2::SecurityGroup.Name" + } + ] }, { "op": "add", - "path": "/properties/SecurityGroups/format", - "value": "AWS::EC2::SecurityGroup.Ids" + "path": "/properties/SecurityGroups/items/anyOf", + "value": [ + { + "format": "AWS::EC2::SecurityGroup.Id" + }, + { + "format": "AWS::EC2::SecurityGroup.Name" + } + ] }, { "op": "add", - "path": "/properties/SecurityGroups/items/format", - "value": "AWS::EC2::SecurityGroup.Id" + "path": "/properties/ImageId/format", + "value": "AWS::EC2::Image.Id" } ] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticache_securitygroupingress/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticache_securitygroupingress/format.json new file mode 100644 index 0000000000..db6d890dac --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_elasticache_securitygroupingress/format.json @@ -0,0 +1,12 @@ +[ + { + "op": "add", + "path": "/properties/CacheSecurityGroupName/format", + "value": "AWS::EC2::SecurityGroup.Name" + }, + { + "op": "add", + "path": "/properties/EC2SecurityGroupName/format", + "value": "AWS::EC2::SecurityGroup.Name" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroup/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroup/format.json new file mode 100644 index 0000000000..54efaa0cfc --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroup/format.json @@ -0,0 +1,12 @@ +[ + { + "op": "add", + "path": "/definitions/Ingress/properties/EC2SecurityGroupId/format", + "value": "AWS::EC2::SecurityGroup.Id" + }, + { + "op": "add", + "path": "/definitions/Ingress/properties/EC2SecurityGroupName/format", + "value": "AWS::EC2::SecurityGroup.Name" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroupingress/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroupingress/format.json new file mode 100644 index 0000000000..b7121edd3e --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_rds_dbsecuritygroupingress/format.json @@ -0,0 +1,12 @@ +[ + { + "op": "add", + "path": "/properties/EC2SecurityGroupId/format", + "value": "AWS::EC2::SecurityGroup.Id" + }, + { + "op": "add", + "path": "/properties/EC2SecurityGroupName/format", + "value": "AWS::EC2::SecurityGroup.Name" + } +] diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_clustersecuritygroupingress/format.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_clustersecuritygroupingress/format.json new file mode 100644 index 0000000000..4f81ddbe7a --- /dev/null +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_redshift_clustersecuritygroupingress/format.json @@ -0,0 +1,12 @@ +[ + { + "op": "add", + "path": "/properties/ClusterSecurityGroupName/format", + "value": "AWS::EC2::SecurityGroup.Name" + }, + { + "op": "add", + "path": "/properties/EC2SecurityGroupName/format", + "value": "AWS::EC2::SecurityGroup.Name" + } +] 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 7f9a355d79..465b941ce1 100644 --- a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py @@ -877,6 +877,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", @@ -1025,7 +1026,6 @@ "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", @@ -1134,7 +1134,6 @@ "aws-docdb-eventsubscription.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnroute.json", "aws-ec2-clientvpntargetnetworkassociation.json", @@ -1217,7 +1216,6 @@ "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", @@ -1288,7 +1286,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1399,7 +1396,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-session.json", "aws-mediaconnect-bridge.json", @@ -1426,6 +1425,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", @@ -1519,6 +1519,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/af_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_central_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudwatch-metricstream.json similarity index 94% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudwatch-metricstream.json rename to src/cfnlint/data/schemas/providers/af_south_1/aws-cloudwatch-metricstream.json index 2d8b6042f2..89ca2654d5 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudwatch-metricstream.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-cloudwatch-metricstream.json @@ -220,12 +220,9 @@ "/properties/State" ], "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CloudWatch::MetricStream" + "taggable": true, + "typeName": "AWS::CloudWatch::MetricStream", + "writeOnlyProperties": [ + "/properties/Tags" + ] } diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json similarity index 95% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-capacityreservation.json rename to src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json index a4a5771479..5a10969ce5 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-capacityreservation.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json @@ -9,8 +9,7 @@ "/properties/OutPostArn", "/properties/EphemeralStorage", "/properties/EbsOptimized", - "/properties/PlacementGroupArn", - "/properties/AvailabilityZoneId" + "/properties/PlacementGroupArn" ], "definitions": { "Tag": { @@ -145,9 +144,6 @@ "AvailabilityZone": { "type": "string" }, - "AvailabilityZoneId": { - "type": "string" - }, "AvailableInstanceCount": { "type": "integer" }, @@ -243,16 +239,10 @@ ], "required": [ "InstanceCount", + "AvailabilityZone", "InstancePlatform", "InstanceType" ], - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/TagSpecifications", - "tagUpdatable": true, - "taggable": true - }, "typeName": "AWS::EC2::CapacityReservation", "writeOnlyProperties": [ "/properties/UnusedReservationBillingOwnerId" diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpnconnection.json similarity index 99% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-vpnconnection.json rename to src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpnconnection.json index 28b2c8b013..5f9a8ac704 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ec2-vpnconnection.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-vpnconnection.json @@ -369,7 +369,6 @@ "readOnlyProperties": [ "/properties/VpnConnectionId" ], - "replacementStrategy": "delete_then_create", "required": [ "Type", "CustomerGatewayId" diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json similarity index 98% rename from src/cfnlint/data/schemas/providers/cn_north_1/aws-fms-policy.json rename to src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json index 3d4f573a4c..8422693828 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-fms-policy.json +++ b/src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json @@ -366,13 +366,6 @@ "type": "array", "uniqueItems": true }, - "ResourceTagLogicalOperator": { - "enum": [ - "AND", - "OR" - ], - "type": "string" - }, "ResourceTags": { "insertionOrder": true, "items": { diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-m2-application.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/af_south_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/af_south_1/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/af_south_1/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py index 5c05d313ea..a54a32edac 100644 --- a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py @@ -543,6 +543,7 @@ "AWS::Logs::DeliveryDestination", "AWS::Logs::DeliverySource", "AWS::Logs::Destination", + "AWS::Logs::Integration", "AWS::Logs::LogAnomalyDetector", "AWS::Logs::LogGroup", "AWS::Logs::LogStream", @@ -854,6 +855,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", @@ -1172,7 +1174,6 @@ "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", @@ -1242,7 +1243,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1372,6 +1372,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", @@ -1459,6 +1460,7 @@ "aws-rds-dbproxytargetgroup.json", "aws-rds-dbsecuritygroup.json", "aws-rds-dbsecuritygroupingress.json", + "aws-rds-dbshardgroup.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", "aws-rds-globalcluster.json", @@ -1476,7 +1478,6 @@ "aws-redshift-scheduledaction.json", "aws-redshiftserverless-namespace.json", "aws-redshiftserverless-workgroup.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/ap_east_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_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/ap_east_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json similarity index 98% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-fms-policy.json rename to src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json index 3d4f573a4c..8422693828 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-fms-policy.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json @@ -366,13 +366,6 @@ "type": "array", "uniqueItems": true }, - "ResourceTagLogicalOperator": { - "enum": [ - "AND", - "OR" - ], - "type": "string" - }, "ResourceTags": { "insertionOrder": true, "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-rds-dbshardgroup.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-rds-dbshardgroup.json deleted file mode 100644 index 691fa97c30..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-rds-dbshardgroup.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DBClusterIdentifier", - "/properties/DBShardGroupIdentifier", - "/properties/PubliclyAccessible" - ], - "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/DBShardGroupIdentifier" - ], - "properties": { - "ComputeRedundancy": { - "minimum": 0, - "type": "integer" - }, - "DBClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupResourceId": { - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "MaxACU": { - "type": "number" - }, - "MinACU": { - "type": "number" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/DBClusterIdentifier": "$lowercase(DBClusterIdentifier)", - "/properties/DBShardGroupIdentifier": "$lowercase(DBShardGroupIdentifier)" - }, - "readOnlyProperties": [ - "/properties/DBShardGroupResourceId", - "/properties/Endpoint" - ], - "required": [ - "DBClusterIdentifier", - "MaxACU" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": false, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::RDS::DBShardGroup", - "writeOnlyProperties": [ - "/properties/MinACU" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json similarity index 94% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-resiliencehub-app.json rename to src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json index 51face9e24..40b055a88b 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-resiliencehub-app.json +++ b/src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json @@ -181,6 +181,10 @@ "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" diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py index edc55f2062..5675a18ff1 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py @@ -1307,6 +1307,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", @@ -2232,6 +2233,7 @@ "aws-pcaconnectorad-templategroupaccesscontrolentry.json", "aws-pcaconnectorscep-challenge.json", "aws-pcaconnectorscep-connector.json", + "aws-pcs-cluster.json", "aws-pcs-computenodegroup.json", "aws-pcs-queue.json", "aws-personalize-dataset.json", @@ -2283,6 +2285,7 @@ "aws-rds-dbproxytargetgroup.json", "aws-rds-dbsecuritygroup.json", "aws-rds-dbsecuritygroupingress.json", + "aws-rds-dbshardgroup.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", "aws-rds-globalcluster.json", @@ -2485,6 +2488,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", @@ -2504,7 +2508,7 @@ "aws-synthetics-group.json", "aws-systemsmanagersap-application.json", "aws-timestream-database.json", - "aws-timestream-scheduledquery.json", + "aws-timestream-influxdbinstance.json", "aws-timestream-table.json", "aws-transfer-agreement.json", "aws-transfer-certificate.json", diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_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/ap_northeast_1/aws-pcs-cluster.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pcs-cluster.json deleted file mode 100644 index 0eb3ff4219..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-pcs-cluster.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Networking", - "/properties/Scheduler", - "/properties/Size", - "/properties/SlurmConfiguration" - ], - "definitions": { - "AuthKey": { - "additionalProperties": false, - "properties": { - "SecretArn": { - "type": "string" - }, - "SecretVersion": { - "type": "string" - } - }, - "required": [ - "SecretArn", - "SecretVersion" - ], - "type": "object" - }, - "Endpoint": { - "additionalProperties": false, - "properties": { - "Port": { - "type": "string" - }, - "PrivateIpAddress": { - "type": "string" - }, - "PublicIpAddress": { - "type": "string" - }, - "Type": { - "enum": [ - "SLURMCTLD", - "SLURMDBD" - ], - "type": "string" - } - }, - "required": [ - "Port", - "PrivateIpAddress", - "Type" - ], - "type": "object" - }, - "ErrorInfo": { - "additionalProperties": false, - "properties": { - "Code": { - "type": "string" - }, - "Message": { - "type": "string" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "sg-\\w{8,17}", - "type": "string" - }, - "SlurmCustomSetting": { - "additionalProperties": false, - "properties": { - "ParameterName": { - "type": "string" - }, - "ParameterValue": { - "type": "string" - } - }, - "required": [ - "ParameterName", - "ParameterValue" - ], - "type": "object" - }, - "SubnetId": { - "pattern": "subnet-\\w{8,17}", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Endpoints": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Endpoint" - }, - "type": "array" - }, - "ErrorInfo": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ErrorInfo" - }, - "type": "array" - }, - "Id": { - "pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{1,40})$", - "type": "string" - }, - "Name": { - "type": "string" - }, - "Networking": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array" - } - }, - "type": "object" - }, - "Scheduler": { - "additionalProperties": false, - "properties": { - "Type": { - "enum": [ - "SLURM" - ], - "type": "string" - }, - "Version": { - "type": "string" - } - }, - "required": [ - "Type", - "Version" - ], - "type": "object" - }, - "Size": { - "enum": [ - "SMALL", - "MEDIUM", - "LARGE" - ], - "type": "string" - }, - "SlurmConfiguration": { - "additionalProperties": false, - "properties": { - "AuthKey": { - "$ref": "#/definitions/AuthKey" - }, - "ScaleDownIdleTimeInSeconds": { - "minimum": 1, - "type": "integer" - }, - "SlurmCustomSettings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SlurmCustomSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "Status": { - "enum": [ - "CREATING", - "ACTIVE", - "UPDATING", - "DELETING", - "CREATE_FAILED", - "DELETE_FAILED", - "UPDATE_FAILED" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - "^.+$": { - "type": "string" - } - } - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Endpoints", - "/properties/ErrorInfo", - "/properties/Id", - "/properties/Status" - ], - "required": [ - "Networking", - "Scheduler", - "Size" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-pcs.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::PCS::Cluster" -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-rds-dbshardgroup.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-rds-dbshardgroup.json deleted file mode 100644 index 691fa97c30..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-rds-dbshardgroup.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DBClusterIdentifier", - "/properties/DBShardGroupIdentifier", - "/properties/PubliclyAccessible" - ], - "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/DBShardGroupIdentifier" - ], - "properties": { - "ComputeRedundancy": { - "minimum": 0, - "type": "integer" - }, - "DBClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupResourceId": { - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "MaxACU": { - "type": "number" - }, - "MinACU": { - "type": "number" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/DBClusterIdentifier": "$lowercase(DBClusterIdentifier)", - "/properties/DBShardGroupIdentifier": "$lowercase(DBShardGroupIdentifier)" - }, - "readOnlyProperties": [ - "/properties/DBShardGroupResourceId", - "/properties/Endpoint" - ], - "required": [ - "DBClusterIdentifier", - "MaxACU" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": false, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::RDS::DBShardGroup", - "writeOnlyProperties": [ - "/properties/MinACU" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-timestream-influxdbinstance.json deleted file mode 100644 index bfd94ca75f..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_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_south_1/aws-timestream-scheduledquery.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-timestream-scheduledquery.json similarity index 98% rename from src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-scheduledquery.json rename to src/cfnlint/data/schemas/providers/ap_northeast_1/aws-timestream-scheduledquery.json index 3520e12bbb..167de59178 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-scheduledquery.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-timestream-scheduledquery.json @@ -455,12 +455,5 @@ "ErrorReportConfiguration" ], "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::ScheduledQuery" } 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 69b59b0406..e621f07118 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py @@ -1200,6 +1200,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", @@ -1335,6 +1336,7 @@ "aws-bedrock-guardrailversion.json", "aws-bedrock-knowledgebase.json", "aws-bedrock-prompt.json", + "aws-bedrock-promptversion.json", "aws-budgets-budget.json", "aws-budgets-budgetsaction.json", "aws-cassandra-keyspace.json", @@ -1537,7 +1539,6 @@ "aws-docdbelastic-cluster.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-carriergateway.json", "aws-ec2-clientvpnauthorizationrule.json", @@ -1629,7 +1630,6 @@ "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", @@ -1707,7 +1707,6 @@ "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", @@ -1937,7 +1936,9 @@ "aws-logs-transformer.json", "aws-lookoutequipment-inferencescheduler.json", "aws-lookoutvision-project.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", @@ -2004,6 +2005,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", @@ -2140,6 +2142,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/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_northeast_2/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-bedrock-promptversion.json deleted file mode 100644 index b79f1da1a7..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-bedrock-promptversion.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/PromptArn", - "/properties/Description", - "/properties/Tags" - ], - "definitions": { - "PromptInferenceConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/PromptModelInferenceConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptInputVariable": { - "additionalProperties": false, - "properties": { - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - } - }, - "type": "object" - }, - "PromptModelInferenceConfiguration": { - "additionalProperties": false, - "properties": { - "MaxTokens": { - "maximum": 4096, - "minimum": 0, - "type": "number" - }, - "StopSequences": { - "insertionOrder": true, - "items": { - "type": "string" - }, - "maxItems": 4, - "minItems": 0, - "type": "array" - }, - "Temperature": { - "maximum": 1, - "minimum": 0, - "type": "number" - }, - "TopP": { - "maximum": 1, - "minimum": 0, - "type": "number" - } - }, - "type": "object" - }, - "PromptTemplateConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/TextPromptTemplateConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptTemplateType": { - "enum": [ - "TEXT" - ], - "type": "string" - }, - "PromptVariant": { - "additionalProperties": false, - "properties": { - "InferenceConfiguration": { - "$ref": "#/definitions/PromptInferenceConfiguration" - }, - "ModelId": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$", - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "TemplateConfiguration": { - "$ref": "#/definitions/PromptTemplateConfiguration" - }, - "TemplateType": { - "$ref": "#/definitions/PromptTemplateType" - } - }, - "required": [ - "Name", - "TemplateType", - "TemplateConfiguration" - ], - "type": "object" - }, - "TagsMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z0-9\\s._:/=+@-]*$": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$", - "type": "string" - } - }, - "type": "object" - }, - "TextPromptTemplateConfiguration": { - "additionalProperties": false, - "properties": { - "InputVariables": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptInputVariable" - }, - "maxItems": 5, - "minItems": 0, - "type": "array" - }, - "Text": { - "maxLength": 200000, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Text" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}:[0-9]{1,20})$", - "type": "string" - }, - "CreatedAt": { - "format": "date-time", - "type": "string" - }, - "CustomerEncryptionKeyArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$", - "type": "string" - }, - "DefaultVariant": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "Description": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "PromptArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10})$", - "type": "string" - }, - "PromptId": { - "pattern": "^[0-9a-zA-Z]{10}$", - "type": "string" - }, - "Tags": { - "$ref": "#/definitions/TagsMap" - }, - "UpdatedAt": { - "format": "date-time", - "type": "string" - }, - "Variants": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptVariant" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "Version": { - "maxLength": 5, - "minLength": 1, - "pattern": "^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreatedAt", - "/properties/PromptId", - "/properties/UpdatedAt", - "/properties/Version", - "/properties/Name", - "/properties/DefaultVariant", - "/properties/Variants", - "/properties/CustomerEncryptionKeyArn" - ], - "required": [ - "PromptArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-prompts", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": false, - "taggable": true - }, - "typeName": "AWS::Bedrock::PromptVersion" -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/ap_northeast_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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_northeast_2/aws-emrserverless-application.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-emrserverless-application.json deleted file mode 100644 index 1d2c5c86ed..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-emrserverless-application.json +++ /dev/null @@ -1,556 +0,0 @@ -{ - "additionalProperties": false, - "conditionalCreateOnlyProperties": [ - "/properties/Architecture", - "/properties/ReleaseLabel", - "/properties/WorkerTypeSpecifications", - "/properties/MaximumCapacity", - "/properties/InitialCapacity", - "/properties/AutoStartConfiguration", - "/properties/AutoStopConfiguration", - "/properties/NetworkConfiguration", - "/properties/ImageConfiguration", - "/properties/MonitoringConfiguration", - "/properties/RuntimeConfiguration", - "/properties/InteractiveConfiguration", - "/properties/SchedulerConfiguration" - ], - "createOnlyProperties": [ - "/properties/Name", - "/properties/Type" - ], - "definitions": { - "Architecture": { - "enum": [ - "ARM64", - "X86_64" - ], - "type": "string" - }, - "AutoStartConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": true, - "type": "boolean" - } - }, - "required": [], - "type": "object" - }, - "AutoStopConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": true, - "type": "boolean" - }, - "IdleTimeoutMinutes": { - "type": "integer" - } - }, - "required": [], - "type": "object" - }, - "Classification": { - "maxLength": 1024, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "CloudWatchLoggingConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": false, - "type": "boolean" - }, - "EncryptionKeyArn": { - "$ref": "#/definitions/EncryptionKeyArn" - }, - "LogGroupName": { - "$ref": "#/definitions/LogGroupName" - }, - "LogStreamNamePrefix": { - "$ref": "#/definitions/LogStreamNamePrefix" - }, - "LogTypeMap": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/LogTypeMapKeyValuePair" - }, - "type": "array", - "uniqueItems": true - } - } - }, - "ConfigurationList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ConfigurationObject" - }, - "type": "array", - "uniqueItems": true - }, - "ConfigurationObject": { - "additionalProperties": false, - "properties": { - "Classification": { - "$ref": "#/definitions/Classification" - }, - "Configurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ConfigurationObject" - }, - "type": "array", - "uniqueItems": true - }, - "Properties": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z]+[-a-zA-Z0-9_.]*$": { - "$ref": "#/definitions/SensitivePropertiesMap" - } - }, - "type": "object" - } - }, - "required": [ - "Classification" - ], - "type": "object" - }, - "CpuSize": { - "maxLength": 15, - "minLength": 1, - "pattern": "^[1-9][0-9]*(\\s)?(vCPU|vcpu|VCPU)?$", - "type": "string" - }, - "DiskSize": { - "maxLength": 15, - "minLength": 1, - "pattern": "^[1-9][0-9]*(\\s)?(GB|gb|gB|Gb)$", - "type": "string" - }, - "DiskType": { - "pattern": "^(SHUFFLE_OPTIMIZED|[Ss]huffle_[Oo]ptimized|STANDARD|[Ss]tandard)$", - "type": "string" - }, - "EncryptionKeyArn": { - "maxLength": 2048, - "minLength": 20, - "pattern": "^arn:(aws[a-zA-Z0-9-]*):kms:[a-zA-Z0-9\\-]*:(\\d{12})?:key\\/[a-zA-Z0-9-]+$", - "type": "string" - }, - "ImageConfigurationInput": { - "additionalProperties": false, - "properties": { - "ImageUri": { - "maxLength": 1024, - "minLength": 1, - "pattern": "^([a-z0-9]+[a-z0-9-.]*)\\/((?:[a-z0-9]+(?:[._-][a-z0-9]+)*\\/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)(?:\\:([a-zA-Z0-9_][a-zA-Z0-9-._]{0,299})|@(sha256:[0-9a-f]{64}))$", - "type": "string" - } - }, - "type": "object" - }, - "InitialCapacityConfig": { - "additionalProperties": false, - "properties": { - "WorkerConfiguration": { - "$ref": "#/definitions/WorkerConfiguration" - }, - "WorkerCount": { - "format": "int64", - "maximum": 1000000, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "WorkerCount", - "WorkerConfiguration" - ], - "type": "object" - }, - "InitialCapacityConfigKeyValuePair": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 50, - "minLength": 1, - "pattern": "^[a-zA-Z]+[-_]*[a-zA-Z]+$", - "type": "string" - }, - "Value": { - "$ref": "#/definitions/InitialCapacityConfig" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "InitialCapacityConfigMap": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/InitialCapacityConfigKeyValuePair" - }, - "type": "array", - "uniqueItems": true - }, - "InteractiveConfiguration": { - "additionalProperties": false, - "properties": { - "LivyEndpointEnabled": { - "default": false, - "type": "boolean" - }, - "StudioEnabled": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "LogGroupName": { - "format": "AWS::Logs::LogGroup.Name", - "maxLength": 512, - "minLength": 1, - "pattern": "^[\\.\\-_/#A-Za-z0-9]+$", - "type": "string" - }, - "LogStreamNamePrefix": { - "maxLength": 512, - "minLength": 1, - "pattern": "^[^:*]*$", - "type": "string" - }, - "LogTypeList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/LogTypeString" - }, - "maxItems": 5, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "LogTypeMapKeyValuePair": { - "additionalProperties": false, - "properties": { - "Key": { - "$ref": "#/definitions/WorkerTypeString" - }, - "Value": { - "$ref": "#/definitions/LogTypeList" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "LogTypeString": { - "maxLength": 50, - "minLength": 1, - "pattern": "^[a-zA-Z]+[-_]*[a-zA-Z]+$", - "type": "string" - }, - "ManagedPersistenceMonitoringConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": true, - "type": "boolean" - }, - "EncryptionKeyArn": { - "$ref": "#/definitions/EncryptionKeyArn" - } - } - }, - "MaximumAllowedResources": { - "additionalProperties": false, - "properties": { - "Cpu": { - "$ref": "#/definitions/CpuSize" - }, - "Disk": { - "$ref": "#/definitions/DiskSize" - }, - "Memory": { - "$ref": "#/definitions/MemorySize" - } - }, - "required": [ - "Cpu", - "Memory" - ], - "type": "object" - }, - "MemorySize": { - "maxLength": 15, - "minLength": 1, - "pattern": "^[1-9][0-9]*(\\s)?(GB|gb|gB|Gb)?$", - "type": "string" - }, - "MonitoringConfiguration": { - "additionalProperties": false, - "properties": { - "CloudWatchLoggingConfiguration": { - "$ref": "#/definitions/CloudWatchLoggingConfiguration" - }, - "ManagedPersistenceMonitoringConfiguration": { - "$ref": "#/definitions/ManagedPersistenceMonitoringConfiguration" - }, - "S3MonitoringConfiguration": { - "$ref": "#/definitions/S3MonitoringConfiguration" - } - }, - "type": "object" - }, - "NetworkConfiguration": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "maxItems": 5, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "maxItems": 16, - "minItems": 1, - "type": "array", - "uniqueItems": true - } - }, - "required": [], - "type": "object" - }, - "S3MonitoringConfiguration": { - "additionalProperties": false, - "properties": { - "EncryptionKeyArn": { - "$ref": "#/definitions/EncryptionKeyArn" - }, - "LogUri": { - "$ref": "#/definitions/UriString" - } - } - }, - "SchedulerConfiguration": { - "additionalProperties": false, - "properties": { - "MaxConcurrentRuns": { - "type": "integer" - }, - "QueueTimeoutMinutes": { - "type": "integer" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "maxLength": 32, - "minLength": 1, - "pattern": "[-0-9a-zA-Z]+.*", - "type": "string" - }, - "SensitivePropertiesKeyValuePair": { - "maxLength": 1024, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "SensitivePropertiesMap": { - "maxLength": 1024, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "SubnetId": { - "maxLength": 32, - "minLength": 1, - "pattern": "[-0-9a-zA-Z]+.*", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^[A-Za-z0-9 /_.:=+@-]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[A-Za-z0-9 /_.:=+@-]*$", - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "UriString": { - "maxLength": 10280, - "minLength": 1, - "pattern": "[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDBFF-\\uDC00\\uDFFF\\r\\n\\t]*", - "type": "string" - }, - "WorkerConfiguration": { - "additionalProperties": false, - "properties": { - "Cpu": { - "$ref": "#/definitions/CpuSize" - }, - "Disk": { - "$ref": "#/definitions/DiskSize" - }, - "DiskType": { - "$ref": "#/definitions/DiskType" - }, - "Memory": { - "$ref": "#/definitions/MemorySize" - } - }, - "required": [ - "Cpu", - "Memory" - ], - "type": "object" - }, - "WorkerTypeSpecificationInput": { - "additionalProperties": false, - "properties": { - "ImageConfiguration": { - "$ref": "#/definitions/ImageConfigurationInput" - } - }, - "type": "object" - }, - "WorkerTypeSpecificationInputMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z]+[-_]*[a-zA-Z]+$": { - "$ref": "#/definitions/WorkerTypeSpecificationInput" - } - }, - "type": "object" - }, - "WorkerTypeString": { - "maxLength": 50, - "minLength": 1, - "pattern": "^[a-zA-Z]+[-_]*[a-zA-Z]+$", - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationId" - ], - "properties": { - "ApplicationId": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "Architecture": { - "$ref": "#/definitions/Architecture" - }, - "Arn": { - "pattern": "^arn:(aws[a-zA-Z0-9-]*):emr-serverless:.+:(\\d{12}):\\/applications\\/[0-9a-zA-Z]+$", - "type": "string" - }, - "AutoStartConfiguration": { - "$ref": "#/definitions/AutoStartConfiguration" - }, - "AutoStopConfiguration": { - "$ref": "#/definitions/AutoStopConfiguration" - }, - "ImageConfiguration": { - "$ref": "#/definitions/ImageConfigurationInput" - }, - "InitialCapacity": { - "$ref": "#/definitions/InitialCapacityConfigMap" - }, - "InteractiveConfiguration": { - "$ref": "#/definitions/InteractiveConfiguration" - }, - "MaximumCapacity": { - "$ref": "#/definitions/MaximumAllowedResources" - }, - "MonitoringConfiguration": { - "$ref": "#/definitions/MonitoringConfiguration" - }, - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": "^[A-Za-z0-9._\\/#-]+$", - "type": "string" - }, - "NetworkConfiguration": { - "$ref": "#/definitions/NetworkConfiguration" - }, - "ReleaseLabel": { - "maxLength": 64, - "minLength": 1, - "pattern": "^[A-Za-z0-9._/-]+$", - "type": "string" - }, - "RuntimeConfiguration": { - "$ref": "#/definitions/ConfigurationList" - }, - "SchedulerConfiguration": { - "$ref": "#/definitions/SchedulerConfiguration" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array", - "uniqueItems": true - }, - "Type": { - "type": "string" - }, - "WorkerTypeSpecifications": { - "$ref": "#/definitions/WorkerTypeSpecificationInputMap" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/ApplicationId" - ], - "required": [ - "ReleaseLabel", - "Type" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::EMRServerless::Application" -} diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json similarity index 98% rename from src/cfnlint/data/schemas/providers/us_west_2/aws-fms-policy.json rename to src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json index 3d4f573a4c..8422693828 100644 --- a/src/cfnlint/data/schemas/providers/us_west_2/aws-fms-policy.json +++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json @@ -366,13 +366,6 @@ "type": "array", "uniqueItems": true }, - "ResourceTagLogicalOperator": { - "enum": [ - "AND", - "OR" - ], - "type": "string" - }, "ResourceTags": { "insertionOrder": true, "items": { diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-m2-application.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/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/ap_northeast_2/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py index 9704506941..9652f1a89f 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py @@ -1138,7 +1138,6 @@ "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", @@ -1208,7 +1207,6 @@ "aws-eventschemas-registrypolicy.json", "aws-eventschemas-schema.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-snapshot.json", @@ -1310,7 +1308,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", "aws-macie-session.json", diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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_northeast_3/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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_northeast_3/aws-m2-application.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} 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 d08a9aa567..6bc85ce46e 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py @@ -1199,6 +1199,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", @@ -1399,6 +1400,7 @@ "aws-codeartifact-domain.json", "aws-codeartifact-packagegroup.json", "aws-codeartifact-repository.json", + "aws-codebuild-fleet.json", "aws-codebuild-project.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", @@ -1610,7 +1612,6 @@ "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", @@ -1683,7 +1684,6 @@ "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", @@ -2289,6 +2289,9 @@ "aws-synthetics-canary.json", "aws-synthetics-group.json", "aws-systemsmanagersap-application.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/ap_south_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_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/ap_south_1/aws-codebuild-fleet.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-codebuild-fleet.json deleted file mode 100644 index 05ad47e89e..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-codebuild-fleet.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "ComputeConfiguration": { - "additionalProperties": false, - "properties": { - "disk": { - "type": "integer" - }, - "machineType": { - "enum": [ - "GENERAL", - "NVME" - ], - "type": "string" - }, - "memory": { - "type": "integer" - }, - "vCpu": { - "type": "integer" - } - }, - "type": "object" - }, - "FleetProxyRule": { - "additionalProperties": false, - "properties": { - "Effect": { - "enum": [ - "ALLOW", - "DENY" - ], - "type": "string" - }, - "Entities": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "type": "array" - }, - "Type": { - "enum": [ - "DOMAIN", - "IP" - ], - "type": "string" - } - }, - "type": "object" - }, - "ProxyConfiguration": { - "additionalProperties": false, - "properties": { - "DefaultBehavior": { - "enum": [ - "ALLOW_ALL", - "DENY_ALL" - ], - "type": "string" - }, - "OrderedProxyRules": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/FleetProxyRule" - }, - "type": "array" - } - }, - "type": "object" - }, - "ScalingConfigurationInput": { - "additionalProperties": false, - "properties": { - "MaxCapacity": { - "minimum": 1, - "type": "integer" - }, - "ScalingType": { - "enum": [ - "TARGET_TRACKING_SCALING" - ], - "type": "string" - }, - "TargetTrackingScalingConfigs": { - "items": { - "$ref": "#/definitions/TargetTrackingScalingConfiguration" - }, - "type": "array" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(?!aws:)[a-zA-Z+-=._:/]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "pattern": "[a-zA-Z+-=._:/]+$", - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "TargetTrackingScalingConfiguration": { - "additionalProperties": false, - "properties": { - "MetricType": { - "enum": [ - "FLEET_UTILIZATION_RATE" - ], - "type": "string" - }, - "TargetValue": { - "type": "number" - } - }, - "type": "object" - }, - "VpcConfig": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "type": "array" - }, - "Subnets": { - "format": "AWS::EC2::Subnet.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - }, - "type": "array" - }, - "VpcId": { - "format": "AWS::EC2::VPC.Id", - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "minLength": 1, - "type": "string" - }, - "BaseCapacity": { - "minimum": 1, - "type": "integer" - }, - "ComputeConfiguration": { - "$ref": "#/definitions/ComputeConfiguration" - }, - "ComputeType": { - "enum": [ - "BUILD_GENERAL1_SMALL", - "BUILD_GENERAL1_MEDIUM", - "BUILD_GENERAL1_LARGE", - "BUILD_GENERAL1_XLARGE", - "BUILD_GENERAL1_2XLARGE", - "ATTRIBUTE_BASED_COMPUTE" - ], - "type": "string" - }, - "EnvironmentType": { - "enum": [ - "WINDOWS_SERVER_2019_CONTAINER", - "WINDOWS_SERVER_2022_CONTAINER", - "LINUX_CONTAINER", - "LINUX_GPU_CONTAINER", - "ARM_CONTAINER", - "MAC_ARM" - ], - "type": "string" - }, - "FleetProxyConfiguration": { - "$ref": "#/definitions/ProxyConfiguration" - }, - "FleetServiceRole": { - "pattern": "^(?:arn:)[a-zA-Z+-=,._:/@]+$", - "type": "string" - }, - "FleetVpcConfig": { - "$ref": "#/definitions/VpcConfig" - }, - "ImageId": { - "format": "AWS::EC2::Image.Id", - "pattern": "^((aws/codebuild/[A-Za-z-]+:[0-9]+(-[0-9._]+)?)|ami-[a-z0-9]{1,1020})$", - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 2, - "pattern": "[A-Za-z0-9][A-Za-z0-9\\-_]{1,127}", - "type": "string" - }, - "OverflowBehavior": { - "enum": [ - "QUEUE", - "ON_DEMAND" - ], - "type": "string" - }, - "ScalingConfiguration": { - "$ref": "#/definitions/ScalingConfigurationInput" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CodeBuild::Fleet" -} 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 new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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 new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py index 776e59a065..7a183a3da0 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py @@ -696,6 +696,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", @@ -953,7 +954,6 @@ "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-ecr-pullthroughcacherule.json", @@ -1007,7 +1007,6 @@ "aws-events-eventbuspolicy.json", "aws-events-rule.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-snapshot.json", diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_south_2/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_south_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_south_2/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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_southeast_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py index 27b1a4e6c7..0877e65928 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py @@ -1276,6 +1276,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", @@ -2165,9 +2166,6 @@ "aws-organizations-policy.json", "aws-organizations-resourcepolicy.json", "aws-osis-pipeline.json", - "aws-panorama-applicationinstance.json", - "aws-panorama-package.json", - "aws-panorama-packageversion.json", "aws-paymentcryptography-alias.json", "aws-paymentcryptography-key.json", "aws-pcaconnectorad-connector.json", @@ -2177,6 +2175,7 @@ "aws-pcaconnectorad-templategroupaccesscontrolentry.json", "aws-pcaconnectorscep-challenge.json", "aws-pcaconnectorscep-connector.json", + "aws-pcs-cluster.json", "aws-pcs-computenodegroup.json", "aws-pcs-queue.json", "aws-personalize-dataset.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_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/ap_southeast_1/aws-panorama-applicationinstance.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-applicationinstance.json new file mode 100644 index 0000000000..4c01df56b1 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-applicationinstance.json @@ -0,0 +1,242 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/Name", + "/properties/Description", + "/properties/ManifestPayload", + "/properties/ManifestOverridesPayload", + "/properties/RuntimeRoleArn", + "/properties/DefaultRuntimeContextDevice", + "/properties/ApplicationInstanceIdToReplace" + ], + "definitions": { + "ApplicationInstanceArn": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "ApplicationInstanceHealthStatus": { + "enum": [ + "RUNNING", + "ERROR", + "NOT_AVAILABLE" + ], + "type": "string" + }, + "ApplicationInstanceId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "ApplicationInstanceStatus": { + "enum": [ + "DEPLOYMENT_PENDING", + "DEPLOYMENT_REQUESTED", + "DEPLOYMENT_IN_PROGRESS", + "DEPLOYMENT_ERROR", + "DEPLOYMENT_SUCCEEDED", + "REMOVAL_PENDING", + "REMOVAL_REQUESTED", + "REMOVAL_IN_PROGRESS", + "REMOVAL_FAILED", + "REMOVAL_SUCCEEDED" + ], + "type": "string" + }, + "ApplicationInstanceStatusDescription": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "DefaultRuntimeContextDevice": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "Description": { + "maxLength": 255, + "minLength": 0, + "pattern": "^.*$", + "type": "string" + }, + "DeviceId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "DeviceName": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "ManifestOverridesPayload": { + "additionalProperties": false, + "properties": { + "PayloadData": { + "$ref": "#/definitions/ManifestOverridesPayloadData" + } + }, + "type": "object" + }, + "ManifestOverridesPayloadData": { + "maxLength": 51200, + "minLength": 0, + "pattern": "^.+$", + "type": "string" + }, + "ManifestPayload": { + "additionalProperties": false, + "properties": { + "PayloadData": { + "$ref": "#/definitions/ManifestPayloadData" + } + }, + "type": "object" + }, + "ManifestPayloadData": { + "maxLength": 51200, + "minLength": 1, + "pattern": "^.+$", + "type": "string" + }, + "Name": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "RuntimeRoleArn": { + "maxLength": 255, + "minLength": 1, + "pattern": "^arn:[a-z0-9][-.a-z0-9]{0,62}:iam::[0-9]{12}:role/.+$", + "type": "string" + }, + "StatusFilter": { + "enum": [ + "DEPLOYMENT_SUCCEEDED", + "DEPLOYMENT_ERROR", + "REMOVAL_SUCCEEDED", + "REMOVAL_FAILED", + "PROCESSING_DEPLOYMENT", + "PROCESSING_REMOVAL" + ], + "type": "string" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "pattern": "^.+$", + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "pattern": "^.+$", + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + }, + "TagList": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": true + }, + "Timestamp": { + "type": "integer" + } + }, + "primaryIdentifier": [ + "/properties/ApplicationInstanceId" + ], + "properties": { + "ApplicationInstanceId": { + "$ref": "#/definitions/ApplicationInstanceId" + }, + "ApplicationInstanceIdToReplace": { + "$ref": "#/definitions/ApplicationInstanceId" + }, + "Arn": { + "$ref": "#/definitions/ApplicationInstanceArn" + }, + "CreatedTime": { + "$ref": "#/definitions/Timestamp" + }, + "DefaultRuntimeContextDevice": { + "$ref": "#/definitions/DefaultRuntimeContextDevice" + }, + "DefaultRuntimeContextDeviceName": { + "$ref": "#/definitions/DeviceName" + }, + "Description": { + "$ref": "#/definitions/Description" + }, + "HealthStatus": { + "$ref": "#/definitions/ApplicationInstanceHealthStatus" + }, + "LastUpdatedTime": { + "$ref": "#/definitions/Timestamp" + }, + "ManifestOverridesPayload": { + "$ref": "#/definitions/ManifestOverridesPayload" + }, + "ManifestPayload": { + "$ref": "#/definitions/ManifestPayload" + }, + "Name": { + "$ref": "#/definitions/Name" + }, + "RuntimeRoleArn": { + "$ref": "#/definitions/RuntimeRoleArn" + }, + "Status": { + "$ref": "#/definitions/ApplicationInstanceStatus" + }, + "StatusDescription": { + "$ref": "#/definitions/ApplicationInstanceStatusDescription" + }, + "Tags": { + "$ref": "#/definitions/TagList" + } + }, + "readOnlyProperties": [ + "/properties/ApplicationInstanceId", + "/properties/Arn", + "/properties/Status", + "/properties/HealthStatus", + "/properties/StatusDescription", + "/properties/DefaultRuntimeContextDeviceName", + "/properties/CreatedTime", + "/properties/LastUpdatedTime" + ], + "required": [ + "ManifestPayload", + "DefaultRuntimeContextDevice" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::Panorama::ApplicationInstance", + "writeOnlyProperties": [ + "/properties/ApplicationInstanceIdToReplace" + ] +} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json new file mode 100644 index 0000000000..a8ea1b7b3e --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json @@ -0,0 +1,124 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/PackageName" + ], + "definitions": { + "NodePackageArn": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "NodePackageId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$", + "type": "string" + }, + "NodePackageName": { + "maxLength": 128, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "StorageLocation": { + "additionalProperties": false, + "properties": { + "BinaryPrefixLocation": { + "type": "string" + }, + "Bucket": { + "type": "string" + }, + "GeneratedPrefixLocation": { + "type": "string" + }, + "ManifestPrefixLocation": { + "type": "string" + }, + "RepoPrefixLocation": { + "type": "string" + } + }, + "type": "object" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "pattern": "^.+$", + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "pattern": "^.+$", + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + }, + "TagList": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": true + }, + "Timestamp": { + "type": "integer" + } + }, + "primaryIdentifier": [ + "/properties/PackageId" + ], + "properties": { + "Arn": { + "$ref": "#/definitions/NodePackageArn" + }, + "CreatedTime": { + "$ref": "#/definitions/Timestamp" + }, + "PackageId": { + "$ref": "#/definitions/NodePackageId" + }, + "PackageName": { + "$ref": "#/definitions/NodePackageName" + }, + "StorageLocation": { + "$ref": "#/definitions/StorageLocation" + }, + "Tags": { + "$ref": "#/definitions/TagList" + } + }, + "readOnlyProperties": [ + "/properties/PackageId", + "/properties/Arn", + "/properties/CreatedTime", + "/properties/StorageLocation/Bucket", + "/properties/StorageLocation/RepoPrefixLocation", + "/properties/StorageLocation/GeneratedPrefixLocation", + "/properties/StorageLocation/BinaryPrefixLocation", + "/properties/StorageLocation/ManifestPrefixLocation" + ], + "required": [ + "PackageName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::Panorama::Package" +} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json new file mode 100644 index 0000000000..4e1669e777 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json @@ -0,0 +1,124 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/OwnerAccount", + "/properties/PackageId", + "/properties/PackageVersion", + "/properties/PatchVersion" + ], + "definitions": { + "NodePackageArn": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "NodePackageId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$", + "type": "string" + }, + "NodePackageName": { + "maxLength": 128, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "NodePackagePatchVersion": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-z0-9]+$", + "type": "string" + }, + "NodePackageVersion": { + "maxLength": 255, + "minLength": 1, + "pattern": "^([0-9]+)\\.([0-9]+)$", + "type": "string" + }, + "PackageOwnerAccount": { + "maxLength": 12, + "minLength": 1, + "pattern": "^[0-9a-z\\_]+$", + "type": "string" + }, + "PackageVersionStatus": { + "enum": [ + "REGISTER_PENDING", + "REGISTER_COMPLETED", + "FAILED", + "DELETING" + ], + "type": "string" + }, + "PackageVersionStatusDescription": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "TimeStamp": { + "type": "integer" + } + }, + "primaryIdentifier": [ + "/properties/PackageId", + "/properties/PackageVersion", + "/properties/PatchVersion" + ], + "properties": { + "IsLatestPatch": { + "type": "boolean" + }, + "MarkLatest": { + "type": "boolean" + }, + "OwnerAccount": { + "$ref": "#/definitions/PackageOwnerAccount" + }, + "PackageArn": { + "$ref": "#/definitions/NodePackageArn" + }, + "PackageId": { + "$ref": "#/definitions/NodePackageId" + }, + "PackageName": { + "$ref": "#/definitions/NodePackageName" + }, + "PackageVersion": { + "$ref": "#/definitions/NodePackageVersion" + }, + "PatchVersion": { + "$ref": "#/definitions/NodePackagePatchVersion" + }, + "RegisteredTime": { + "$ref": "#/definitions/TimeStamp" + }, + "Status": { + "$ref": "#/definitions/PackageVersionStatus" + }, + "StatusDescription": { + "$ref": "#/definitions/PackageVersionStatusDescription" + }, + "UpdatedLatestPatchVersion": { + "$ref": "#/definitions/NodePackagePatchVersion" + } + }, + "readOnlyProperties": [ + "/properties/PackageName", + "/properties/PackageArn", + "/properties/Status", + "/properties/StatusDescription", + "/properties/IsLatestPatch", + "/properties/RegisteredTime" + ], + "required": [ + "PackageId", + "PackageVersion", + "PatchVersion" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-panorama.git", + "typeName": "AWS::Panorama::PackageVersion", + "writeOnlyProperties": [ + "/properties/UpdatedLatestPatchVersion" + ] +} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pcs-cluster.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pcs-cluster.json deleted file mode 100644 index 0eb3ff4219..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-pcs-cluster.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Networking", - "/properties/Scheduler", - "/properties/Size", - "/properties/SlurmConfiguration" - ], - "definitions": { - "AuthKey": { - "additionalProperties": false, - "properties": { - "SecretArn": { - "type": "string" - }, - "SecretVersion": { - "type": "string" - } - }, - "required": [ - "SecretArn", - "SecretVersion" - ], - "type": "object" - }, - "Endpoint": { - "additionalProperties": false, - "properties": { - "Port": { - "type": "string" - }, - "PrivateIpAddress": { - "type": "string" - }, - "PublicIpAddress": { - "type": "string" - }, - "Type": { - "enum": [ - "SLURMCTLD", - "SLURMDBD" - ], - "type": "string" - } - }, - "required": [ - "Port", - "PrivateIpAddress", - "Type" - ], - "type": "object" - }, - "ErrorInfo": { - "additionalProperties": false, - "properties": { - "Code": { - "type": "string" - }, - "Message": { - "type": "string" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "sg-\\w{8,17}", - "type": "string" - }, - "SlurmCustomSetting": { - "additionalProperties": false, - "properties": { - "ParameterName": { - "type": "string" - }, - "ParameterValue": { - "type": "string" - } - }, - "required": [ - "ParameterName", - "ParameterValue" - ], - "type": "object" - }, - "SubnetId": { - "pattern": "subnet-\\w{8,17}", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Endpoints": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Endpoint" - }, - "type": "array" - }, - "ErrorInfo": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ErrorInfo" - }, - "type": "array" - }, - "Id": { - "pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{1,40})$", - "type": "string" - }, - "Name": { - "type": "string" - }, - "Networking": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array" - } - }, - "type": "object" - }, - "Scheduler": { - "additionalProperties": false, - "properties": { - "Type": { - "enum": [ - "SLURM" - ], - "type": "string" - }, - "Version": { - "type": "string" - } - }, - "required": [ - "Type", - "Version" - ], - "type": "object" - }, - "Size": { - "enum": [ - "SMALL", - "MEDIUM", - "LARGE" - ], - "type": "string" - }, - "SlurmConfiguration": { - "additionalProperties": false, - "properties": { - "AuthKey": { - "$ref": "#/definitions/AuthKey" - }, - "ScaleDownIdleTimeInSeconds": { - "minimum": 1, - "type": "integer" - }, - "SlurmCustomSettings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SlurmCustomSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "Status": { - "enum": [ - "CREATING", - "ACTIVE", - "UPDATING", - "DELETING", - "CREATE_FAILED", - "DELETE_FAILED", - "UPDATE_FAILED" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - "^.+$": { - "type": "string" - } - } - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Endpoints", - "/properties/ErrorInfo", - "/properties/Id", - "/properties/Status" - ], - "required": [ - "Networking", - "Scheduler", - "Size" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-pcs.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::PCS::Cluster" -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py index 260652fb39..c08dace334 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py @@ -1514,6 +1514,7 @@ "aws-codeartifact-domain.json", "aws-codeartifact-packagegroup.json", "aws-codeartifact-repository.json", + "aws-codebuild-fleet.json", "aws-codebuild-project.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", @@ -2279,6 +2280,7 @@ "aws-rds-dbproxytargetgroup.json", "aws-rds-dbsecuritygroup.json", "aws-rds-dbsecuritygroupingress.json", + "aws-rds-dbshardgroup.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", "aws-rds-globalcluster.json", @@ -2488,6 +2490,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_southeast_2/aws-codebuild-fleet.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-codebuild-fleet.json deleted file mode 100644 index 05ad47e89e..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-codebuild-fleet.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "ComputeConfiguration": { - "additionalProperties": false, - "properties": { - "disk": { - "type": "integer" - }, - "machineType": { - "enum": [ - "GENERAL", - "NVME" - ], - "type": "string" - }, - "memory": { - "type": "integer" - }, - "vCpu": { - "type": "integer" - } - }, - "type": "object" - }, - "FleetProxyRule": { - "additionalProperties": false, - "properties": { - "Effect": { - "enum": [ - "ALLOW", - "DENY" - ], - "type": "string" - }, - "Entities": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "type": "array" - }, - "Type": { - "enum": [ - "DOMAIN", - "IP" - ], - "type": "string" - } - }, - "type": "object" - }, - "ProxyConfiguration": { - "additionalProperties": false, - "properties": { - "DefaultBehavior": { - "enum": [ - "ALLOW_ALL", - "DENY_ALL" - ], - "type": "string" - }, - "OrderedProxyRules": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/FleetProxyRule" - }, - "type": "array" - } - }, - "type": "object" - }, - "ScalingConfigurationInput": { - "additionalProperties": false, - "properties": { - "MaxCapacity": { - "minimum": 1, - "type": "integer" - }, - "ScalingType": { - "enum": [ - "TARGET_TRACKING_SCALING" - ], - "type": "string" - }, - "TargetTrackingScalingConfigs": { - "items": { - "$ref": "#/definitions/TargetTrackingScalingConfiguration" - }, - "type": "array" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(?!aws:)[a-zA-Z+-=._:/]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "pattern": "[a-zA-Z+-=._:/]+$", - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "TargetTrackingScalingConfiguration": { - "additionalProperties": false, - "properties": { - "MetricType": { - "enum": [ - "FLEET_UTILIZATION_RATE" - ], - "type": "string" - }, - "TargetValue": { - "type": "number" - } - }, - "type": "object" - }, - "VpcConfig": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "type": "array" - }, - "Subnets": { - "format": "AWS::EC2::Subnet.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - }, - "type": "array" - }, - "VpcId": { - "format": "AWS::EC2::VPC.Id", - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "minLength": 1, - "type": "string" - }, - "BaseCapacity": { - "minimum": 1, - "type": "integer" - }, - "ComputeConfiguration": { - "$ref": "#/definitions/ComputeConfiguration" - }, - "ComputeType": { - "enum": [ - "BUILD_GENERAL1_SMALL", - "BUILD_GENERAL1_MEDIUM", - "BUILD_GENERAL1_LARGE", - "BUILD_GENERAL1_XLARGE", - "BUILD_GENERAL1_2XLARGE", - "ATTRIBUTE_BASED_COMPUTE" - ], - "type": "string" - }, - "EnvironmentType": { - "enum": [ - "WINDOWS_SERVER_2019_CONTAINER", - "WINDOWS_SERVER_2022_CONTAINER", - "LINUX_CONTAINER", - "LINUX_GPU_CONTAINER", - "ARM_CONTAINER", - "MAC_ARM" - ], - "type": "string" - }, - "FleetProxyConfiguration": { - "$ref": "#/definitions/ProxyConfiguration" - }, - "FleetServiceRole": { - "pattern": "^(?:arn:)[a-zA-Z+-=,._:/@]+$", - "type": "string" - }, - "FleetVpcConfig": { - "$ref": "#/definitions/VpcConfig" - }, - "ImageId": { - "format": "AWS::EC2::Image.Id", - "pattern": "^((aws/codebuild/[A-Za-z-]+:[0-9]+(-[0-9._]+)?)|ami-[a-z0-9]{1,1020})$", - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 2, - "pattern": "[A-Za-z0-9][A-Za-z0-9\\-_]{1,127}", - "type": "string" - }, - "OverflowBehavior": { - "enum": [ - "QUEUE", - "ON_DEMAND" - ], - "type": "string" - }, - "ScalingConfiguration": { - "$ref": "#/definitions/ScalingConfigurationInput" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CodeBuild::Fleet" -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-rds-dbshardgroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-rds-dbshardgroup.json deleted file mode 100644 index 691fa97c30..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-rds-dbshardgroup.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DBClusterIdentifier", - "/properties/DBShardGroupIdentifier", - "/properties/PubliclyAccessible" - ], - "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/DBShardGroupIdentifier" - ], - "properties": { - "ComputeRedundancy": { - "minimum": 0, - "type": "integer" - }, - "DBClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupResourceId": { - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "MaxACU": { - "type": "number" - }, - "MinACU": { - "type": "number" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/DBClusterIdentifier": "$lowercase(DBClusterIdentifier)", - "/properties/DBShardGroupIdentifier": "$lowercase(DBShardGroupIdentifier)" - }, - "readOnlyProperties": [ - "/properties/DBShardGroupResourceId", - "/properties/Endpoint" - ], - "required": [ - "DBClusterIdentifier", - "MaxACU" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": false, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::RDS::DBShardGroup", - "writeOnlyProperties": [ - "/properties/MinACU" - ] -} 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 82ad764e15..0d44f88b9f 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py @@ -895,7 +895,6 @@ "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", @@ -951,7 +950,6 @@ "aws-dms-replicationconfig.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnroute.json", "aws-ec2-clientvpntargetnetworkassociation.json", @@ -1032,7 +1030,6 @@ "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", @@ -1099,7 +1096,6 @@ "aws-eventschemas-registrypolicy.json", "aws-eventschemas-schema.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1209,6 +1205,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", @@ -1302,6 +1299,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json similarity index 94% rename from src/cfnlint/data/schemas/providers/cn_north_1/aws-cloudwatch-metricstream.json rename to src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json index 2d8b6042f2..89ca2654d5 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-cloudwatch-metricstream.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json @@ -220,12 +220,9 @@ "/properties/State" ], "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CloudWatch::MetricStream" + "taggable": true, + "typeName": "AWS::CloudWatch::MetricStream", + "writeOnlyProperties": [ + "/properties/Tags" + ] } diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/ap_southeast_3/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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_southeast_3/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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_southeast_3/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/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/ap_southeast_3/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py index da7a46a120..a072ccd8f3 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py @@ -691,6 +691,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", @@ -867,7 +868,6 @@ "aws-dms-replicationconfig.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnroute.json", "aws-ec2-clientvpntargetnetworkassociation.json", @@ -939,7 +939,6 @@ "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-ecr-pullthroughcacherule.json", @@ -991,7 +990,6 @@ "aws-events-eventbuspolicy.json", "aws-events-rule.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", "aws-fsx-snapshot.json", @@ -1113,6 +1111,7 @@ "aws-msk-configuration.json", "aws-msk-vpcconnection.json", "aws-mwaa-environment.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/ap_southeast_4/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/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_4/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/ap_southeast_4/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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_southeast_4/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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_southeast_4/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/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/ap_southeast_5/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py index 096b3f0338..9db56651ca 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py @@ -382,8 +382,11 @@ "AWS::Route53Resolver::FirewallDomainList", "AWS::Route53Resolver::FirewallRuleGroup", "AWS::Route53Resolver::FirewallRuleGroupAssociation", + "AWS::Route53Resolver::ResolverConfig", "AWS::Route53Resolver::ResolverQueryLoggingConfig", "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation", + "AWS::Route53Resolver::ResolverRule", + "AWS::Route53Resolver::ResolverRuleAssociation", "AWS::S3::AccessPoint", "AWS::S3::Bucket", "AWS::S3::BucketPolicy", @@ -459,6 +462,7 @@ "Module", "aws-accessanalyzer-analyzer.json", "aws-acmpca-certificate.json", + "aws-acmpca-certificateauthority.json", "aws-acmpca-certificateauthorityactivation.json", "aws-acmpca-permission.json", "aws-apigateway-account.json", @@ -555,7 +559,6 @@ "aws-datasync-task.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-customergateway.json", "aws-ec2-dhcpoptions.json", "aws-ec2-ec2fleet.json", @@ -615,7 +618,6 @@ "aws-ec2-vpcendpointservice.json", "aws-ec2-vpcendpointservicepermissions.json", "aws-ec2-vpcpeeringconnection.json", - "aws-ec2-vpnconnection.json", "aws-ec2-vpnconnectionroute.json", "aws-ec2-vpngateway.json", "aws-ec2-vpngatewayroutepropagation.json", @@ -734,6 +736,7 @@ "aws-msk-clusterpolicy.json", "aws-msk-configuration.json", "aws-msk-vpcconnection.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", @@ -780,8 +783,11 @@ "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", + "aws-route53resolver-resolverconfig.json", "aws-route53resolver-resolverqueryloggingconfig.json", "aws-route53resolver-resolverqueryloggingconfigassociation.json", + "aws-route53resolver-resolverrule.json", + "aws-route53resolver-resolverruleassociation.json", "aws-s3-accesspoint.json", "aws-s3-bucket.json", "aws-s3-bucketpolicy.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/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_5/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/ap_southeast_5/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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_southeast_5/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_5/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/ap_southeast_7/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py index ee5cb4e350..aaf9b28753 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py @@ -103,6 +103,7 @@ "AWS::DirectoryService::SimpleAD", "AWS::DynamoDB::GlobalTable", "AWS::DynamoDB::Table", + "AWS::EC2::CapacityReservation", "AWS::EC2::CustomerGateway", "AWS::EC2::DHCPOptions", "AWS::EC2::EC2Fleet", @@ -272,6 +273,11 @@ "AWS::OpsWorks::Stack", "AWS::OpsWorks::UserProfile", "AWS::OpsWorks::Volume", + "AWS::Organizations::Account", + "AWS::Organizations::Organization", + "AWS::Organizations::OrganizationalUnit", + "AWS::Organizations::Policy", + "AWS::Organizations::ResourcePolicy", "AWS::RAM::ResourceShare", "AWS::RDS::DBCluster", "AWS::RDS::DBClusterParameterGroup", @@ -563,6 +569,11 @@ "aws-opsworks-elasticloadbalancerattachment.json", "aws-opsworks-userprofile.json", "aws-opsworks-volume.json", + "aws-organizations-account.json", + "aws-organizations-organization.json", + "aws-organizations-organizationalunit.json", + "aws-organizations-policy.json", + "aws-organizations-resourcepolicy.json", "aws-rds-dbcluster.json", "aws-rds-dbclusterparametergroup.json", "aws-rds-dbinstance.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/ca_central_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py index 58405a746f..a442172668 100644 --- a/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py @@ -1160,6 +1160,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", @@ -1650,7 +1651,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1946,9 +1946,6 @@ "aws-organizations-policy.json", "aws-organizations-resourcepolicy.json", "aws-osis-pipeline.json", - "aws-panorama-applicationinstance.json", - "aws-panorama-package.json", - "aws-panorama-packageversion.json", "aws-pcaconnectorad-connector.json", "aws-pcaconnectorad-directoryregistration.json", "aws-pcaconnectorad-serviceprincipalname.json", @@ -2205,6 +2202,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/ca_central_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/ca_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/ca_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/ca_central_1/aws-panorama-applicationinstance.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-applicationinstance.json new file mode 100644 index 0000000000..4c01df56b1 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-applicationinstance.json @@ -0,0 +1,242 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/Name", + "/properties/Description", + "/properties/ManifestPayload", + "/properties/ManifestOverridesPayload", + "/properties/RuntimeRoleArn", + "/properties/DefaultRuntimeContextDevice", + "/properties/ApplicationInstanceIdToReplace" + ], + "definitions": { + "ApplicationInstanceArn": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "ApplicationInstanceHealthStatus": { + "enum": [ + "RUNNING", + "ERROR", + "NOT_AVAILABLE" + ], + "type": "string" + }, + "ApplicationInstanceId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "ApplicationInstanceStatus": { + "enum": [ + "DEPLOYMENT_PENDING", + "DEPLOYMENT_REQUESTED", + "DEPLOYMENT_IN_PROGRESS", + "DEPLOYMENT_ERROR", + "DEPLOYMENT_SUCCEEDED", + "REMOVAL_PENDING", + "REMOVAL_REQUESTED", + "REMOVAL_IN_PROGRESS", + "REMOVAL_FAILED", + "REMOVAL_SUCCEEDED" + ], + "type": "string" + }, + "ApplicationInstanceStatusDescription": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "DefaultRuntimeContextDevice": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "Description": { + "maxLength": 255, + "minLength": 0, + "pattern": "^.*$", + "type": "string" + }, + "DeviceId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "DeviceName": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "ManifestOverridesPayload": { + "additionalProperties": false, + "properties": { + "PayloadData": { + "$ref": "#/definitions/ManifestOverridesPayloadData" + } + }, + "type": "object" + }, + "ManifestOverridesPayloadData": { + "maxLength": 51200, + "minLength": 0, + "pattern": "^.+$", + "type": "string" + }, + "ManifestPayload": { + "additionalProperties": false, + "properties": { + "PayloadData": { + "$ref": "#/definitions/ManifestPayloadData" + } + }, + "type": "object" + }, + "ManifestPayloadData": { + "maxLength": 51200, + "minLength": 1, + "pattern": "^.+$", + "type": "string" + }, + "Name": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "RuntimeRoleArn": { + "maxLength": 255, + "minLength": 1, + "pattern": "^arn:[a-z0-9][-.a-z0-9]{0,62}:iam::[0-9]{12}:role/.+$", + "type": "string" + }, + "StatusFilter": { + "enum": [ + "DEPLOYMENT_SUCCEEDED", + "DEPLOYMENT_ERROR", + "REMOVAL_SUCCEEDED", + "REMOVAL_FAILED", + "PROCESSING_DEPLOYMENT", + "PROCESSING_REMOVAL" + ], + "type": "string" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "pattern": "^.+$", + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "pattern": "^.+$", + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + }, + "TagList": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": true + }, + "Timestamp": { + "type": "integer" + } + }, + "primaryIdentifier": [ + "/properties/ApplicationInstanceId" + ], + "properties": { + "ApplicationInstanceId": { + "$ref": "#/definitions/ApplicationInstanceId" + }, + "ApplicationInstanceIdToReplace": { + "$ref": "#/definitions/ApplicationInstanceId" + }, + "Arn": { + "$ref": "#/definitions/ApplicationInstanceArn" + }, + "CreatedTime": { + "$ref": "#/definitions/Timestamp" + }, + "DefaultRuntimeContextDevice": { + "$ref": "#/definitions/DefaultRuntimeContextDevice" + }, + "DefaultRuntimeContextDeviceName": { + "$ref": "#/definitions/DeviceName" + }, + "Description": { + "$ref": "#/definitions/Description" + }, + "HealthStatus": { + "$ref": "#/definitions/ApplicationInstanceHealthStatus" + }, + "LastUpdatedTime": { + "$ref": "#/definitions/Timestamp" + }, + "ManifestOverridesPayload": { + "$ref": "#/definitions/ManifestOverridesPayload" + }, + "ManifestPayload": { + "$ref": "#/definitions/ManifestPayload" + }, + "Name": { + "$ref": "#/definitions/Name" + }, + "RuntimeRoleArn": { + "$ref": "#/definitions/RuntimeRoleArn" + }, + "Status": { + "$ref": "#/definitions/ApplicationInstanceStatus" + }, + "StatusDescription": { + "$ref": "#/definitions/ApplicationInstanceStatusDescription" + }, + "Tags": { + "$ref": "#/definitions/TagList" + } + }, + "readOnlyProperties": [ + "/properties/ApplicationInstanceId", + "/properties/Arn", + "/properties/Status", + "/properties/HealthStatus", + "/properties/StatusDescription", + "/properties/DefaultRuntimeContextDeviceName", + "/properties/CreatedTime", + "/properties/LastUpdatedTime" + ], + "required": [ + "ManifestPayload", + "DefaultRuntimeContextDevice" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::Panorama::ApplicationInstance", + "writeOnlyProperties": [ + "/properties/ApplicationInstanceIdToReplace" + ] +} diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json new file mode 100644 index 0000000000..a8ea1b7b3e --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json @@ -0,0 +1,124 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/PackageName" + ], + "definitions": { + "NodePackageArn": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "NodePackageId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$", + "type": "string" + }, + "NodePackageName": { + "maxLength": 128, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "StorageLocation": { + "additionalProperties": false, + "properties": { + "BinaryPrefixLocation": { + "type": "string" + }, + "Bucket": { + "type": "string" + }, + "GeneratedPrefixLocation": { + "type": "string" + }, + "ManifestPrefixLocation": { + "type": "string" + }, + "RepoPrefixLocation": { + "type": "string" + } + }, + "type": "object" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "pattern": "^.+$", + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "pattern": "^.+$", + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + }, + "TagList": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Tag" + }, + "type": "array", + "uniqueItems": true + }, + "Timestamp": { + "type": "integer" + } + }, + "primaryIdentifier": [ + "/properties/PackageId" + ], + "properties": { + "Arn": { + "$ref": "#/definitions/NodePackageArn" + }, + "CreatedTime": { + "$ref": "#/definitions/Timestamp" + }, + "PackageId": { + "$ref": "#/definitions/NodePackageId" + }, + "PackageName": { + "$ref": "#/definitions/NodePackageName" + }, + "StorageLocation": { + "$ref": "#/definitions/StorageLocation" + }, + "Tags": { + "$ref": "#/definitions/TagList" + } + }, + "readOnlyProperties": [ + "/properties/PackageId", + "/properties/Arn", + "/properties/CreatedTime", + "/properties/StorageLocation/Bucket", + "/properties/StorageLocation/RepoPrefixLocation", + "/properties/StorageLocation/GeneratedPrefixLocation", + "/properties/StorageLocation/BinaryPrefixLocation", + "/properties/StorageLocation/ManifestPrefixLocation" + ], + "required": [ + "PackageName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::Panorama::Package" +} diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json new file mode 100644 index 0000000000..4e1669e777 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json @@ -0,0 +1,124 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/OwnerAccount", + "/properties/PackageId", + "/properties/PackageVersion", + "/properties/PatchVersion" + ], + "definitions": { + "NodePackageArn": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "NodePackageId": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$", + "type": "string" + }, + "NodePackageName": { + "maxLength": 128, + "minLength": 1, + "pattern": "^[a-zA-Z0-9\\-\\_]+$", + "type": "string" + }, + "NodePackagePatchVersion": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[a-z0-9]+$", + "type": "string" + }, + "NodePackageVersion": { + "maxLength": 255, + "minLength": 1, + "pattern": "^([0-9]+)\\.([0-9]+)$", + "type": "string" + }, + "PackageOwnerAccount": { + "maxLength": 12, + "minLength": 1, + "pattern": "^[0-9a-z\\_]+$", + "type": "string" + }, + "PackageVersionStatus": { + "enum": [ + "REGISTER_PENDING", + "REGISTER_COMPLETED", + "FAILED", + "DELETING" + ], + "type": "string" + }, + "PackageVersionStatusDescription": { + "maxLength": 255, + "minLength": 1, + "type": "string" + }, + "TimeStamp": { + "type": "integer" + } + }, + "primaryIdentifier": [ + "/properties/PackageId", + "/properties/PackageVersion", + "/properties/PatchVersion" + ], + "properties": { + "IsLatestPatch": { + "type": "boolean" + }, + "MarkLatest": { + "type": "boolean" + }, + "OwnerAccount": { + "$ref": "#/definitions/PackageOwnerAccount" + }, + "PackageArn": { + "$ref": "#/definitions/NodePackageArn" + }, + "PackageId": { + "$ref": "#/definitions/NodePackageId" + }, + "PackageName": { + "$ref": "#/definitions/NodePackageName" + }, + "PackageVersion": { + "$ref": "#/definitions/NodePackageVersion" + }, + "PatchVersion": { + "$ref": "#/definitions/NodePackagePatchVersion" + }, + "RegisteredTime": { + "$ref": "#/definitions/TimeStamp" + }, + "Status": { + "$ref": "#/definitions/PackageVersionStatus" + }, + "StatusDescription": { + "$ref": "#/definitions/PackageVersionStatusDescription" + }, + "UpdatedLatestPatchVersion": { + "$ref": "#/definitions/NodePackagePatchVersion" + } + }, + "readOnlyProperties": [ + "/properties/PackageName", + "/properties/PackageArn", + "/properties/Status", + "/properties/StatusDescription", + "/properties/IsLatestPatch", + "/properties/RegisteredTime" + ], + "required": [ + "PackageId", + "PackageVersion", + "PatchVersion" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-panorama.git", + "typeName": "AWS::Panorama::PackageVersion", + "writeOnlyProperties": [ + "/properties/UpdatedLatestPatchVersion" + ] +} diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-timestream-influxdbinstance.json deleted file mode 100644 index bfd94ca75f..0000000000 --- a/src/cfnlint/data/schemas/providers/ca_central_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/ca_west_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py index caee27b99a..b15984afa3 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py @@ -711,7 +711,6 @@ "aws-cloudwatch-compositealarm.json", "aws-cloudwatch-dashboard.json", "aws-cloudwatch-insightrule.json", - "aws-cloudwatch-metricstream.json", "aws-codedeploy-application.json", "aws-codedeploy-deploymentconfig.json", "aws-codedeploy-deploymentgroup.json", @@ -762,7 +761,6 @@ "aws-dms-replicationconfig.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-customergateway.json", "aws-ec2-dhcpoptions.json", @@ -829,7 +827,6 @@ "aws-ec2-vpcendpointservice.json", "aws-ec2-vpcendpointservicepermissions.json", "aws-ec2-vpcpeeringconnection.json", - "aws-ec2-vpnconnection.json", "aws-ec2-vpnconnectionroute.json", "aws-ec2-vpngateway.json", "aws-ec2-vpngatewayroutepropagation.json", @@ -879,7 +876,6 @@ "aws-events-eventbuspolicy.json", "aws-events-rule.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", "aws-fsx-snapshot.json", @@ -974,6 +970,7 @@ "aws-msk-configuration.json", "aws-msk-vpcconnection.json", "aws-mwaa-environment.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", @@ -1047,6 +1044,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json similarity index 94% rename from src/cfnlint/data/schemas/providers/us_west_2/aws-cloudwatch-metricstream.json rename to src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json index 2d8b6042f2..89ca2654d5 100644 --- a/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudwatch-metricstream.json +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json @@ -220,12 +220,9 @@ "/properties/State" ], "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CloudWatch::MetricStream" + "taggable": true, + "typeName": "AWS::CloudWatch::MetricStream", + "writeOnlyProperties": [ + "/properties/Tags" + ] } diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/ca_west_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/ca_west_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ca_west_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/ca_west_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/ca_west_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/ca_west_1/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py b/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py index 256f414962..fd08bda4d5 100644 --- a/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py @@ -845,6 +845,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", @@ -1025,6 +1026,7 @@ "aws-eventschemas-registry.json", "aws-eventschemas-registrypolicy.json", "aws-eventschemas-schema.json", + "aws-fms-policy.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", "aws-fsx-snapshot.json", diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py index 57d86b2b9a..6f14e66af9 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py @@ -686,6 +686,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", @@ -804,7 +805,6 @@ "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", @@ -856,7 +856,6 @@ "aws-docdb-eventsubscription.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-dhcpoptions.json", "aws-ec2-ec2fleet.json", @@ -985,7 +984,6 @@ "aws-eventschemas-registry.json", "aws-eventschemas-registrypolicy.json", "aws-eventschemas-schema.json", - "aws-fms-policy.json", "aws-frauddetector-list.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-snapshot.json", @@ -1010,6 +1008,8 @@ "aws-glue-job.json", "aws-glue-mltransform.json", "aws-glue-partition.json", + "aws-glue-registry.json", + "aws-glue-schema.json", "aws-glue-schemaversion.json", "aws-glue-schemaversionmetadata.json", "aws-glue-securityconfiguration.json", @@ -1121,6 +1121,7 @@ "aws-mwaa-environment.json", "aws-neptune-dbcluster.json", "aws-neptune-dbsubnetgroup.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/cn_northwest_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_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/cn_northwest_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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/cn_northwest_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/cn_northwest_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/cn_northwest_1/aws-glue-registry.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-glue-registry.json deleted file mode 100644 index 5fd0185112..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-glue-registry.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name" - ], - "definitions": { - "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/Arn" - ], - "properties": { - "Arn": { - "pattern": "arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*", - "type": "string" - }, - "Description": { - "maxLength": 1000, - "minLength": 0, - "type": "string" - }, - "Name": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 10, - "minItems": 0, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "required": [ - "Name" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-glue.git", - "typeName": "AWS::Glue::Registry" -} diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-glue-schema.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-glue-schema.json deleted file mode 100644 index 62cbad4119..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-glue-schema.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Registry", - "/properties/Name", - "/properties/DataFormat", - "/properties/SchemaDefinition" - ], - "definitions": { - "Registry": { - "additionalProperties": false, - "properties": { - "Arn": { - "pattern": "arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*", - "type": "string" - }, - "Name": { - "maxLength": 255, - "minLength": 1, - "type": "string" - } - }, - "type": "object" - }, - "SchemaVersion": { - "additionalProperties": false, - "properties": { - "IsLatest": { - "type": "boolean" - }, - "VersionNumber": { - "maximum": 100000, - "minimum": 1, - "type": "integer" - } - }, - "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/Arn" - ], - "properties": { - "Arn": { - "pattern": "arn:aws(-(cn|us-gov|iso(-[bef])?))?:glue:.*", - "type": "string" - }, - "CheckpointVersion": { - "$ref": "#/definitions/SchemaVersion" - }, - "Compatibility": { - "enum": [ - "NONE", - "DISABLED", - "BACKWARD", - "BACKWARD_ALL", - "FORWARD", - "FORWARD_ALL", - "FULL", - "FULL_ALL" - ], - "type": "string" - }, - "DataFormat": { - "enum": [ - "AVRO", - "JSON", - "PROTOBUF" - ], - "type": "string" - }, - "Description": { - "maxLength": 1000, - "minLength": 0, - "type": "string" - }, - "InitialSchemaVersionId": { - "pattern": "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}", - "type": "string" - }, - "Name": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "Registry": { - "$ref": "#/definitions/Registry" - }, - "SchemaDefinition": { - "maxLength": 170000, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 10, - "minItems": 0, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/InitialSchemaVersionId" - ], - "required": [ - "Name", - "DataFormat", - "SchemaDefinition", - "Compatibility" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-glue.git", - "typeName": "AWS::Glue::Schema", - "writeOnlyProperties": [ - "/properties/SchemaDefinition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_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/eu_central_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py index b5f9dee65b..bcdf08e47f 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py @@ -1462,6 +1462,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", @@ -1469,8 +1470,6 @@ "aws-cassandra-keyspace.json", "aws-cassandra-table.json", "aws-cassandra-type.json", - "aws-ce-anomalymonitor.json", - "aws-ce-anomalysubscription.json", "aws-ce-costcategory.json", "aws-certificatemanager-account.json", "aws-certificatemanager-certificate.json", @@ -1528,6 +1527,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", @@ -1684,6 +1684,7 @@ "aws-docdbelastic-cluster.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", + "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-carriergateway.json", "aws-ec2-clientvpnauthorizationrule.json", @@ -1775,6 +1776,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", @@ -1857,6 +1859,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", @@ -2125,7 +2128,6 @@ "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", @@ -2246,6 +2248,7 @@ "aws-pcaconnectorad-templategroupaccesscontrolentry.json", "aws-pcaconnectorscep-challenge.json", "aws-pcaconnectorscep-connector.json", + "aws-pcs-cluster.json", "aws-pcs-computenodegroup.json", "aws-pcs-queue.json", "aws-personalize-dataset.json", @@ -2330,6 +2333,7 @@ "aws-rekognition-collection.json", "aws-rekognition-project.json", "aws-rekognition-streamprocessor.json", + "aws-resiliencehub-app.json", "aws-resiliencehub-resiliencypolicy.json", "aws-resourceexplorer2-defaultviewassociation.json", "aws-resourceexplorer2-index.json", @@ -2503,12 +2507,12 @@ "aws-ssm-maintenancewindowtask.json", "aws-ssm-parameter.json", "aws-ssm-patchbaseline.json", - "aws-ssm-resourcedatasync.json", "aws-ssm-resourcepolicy.json", "aws-ssmcontacts-contact.json", "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", @@ -2527,6 +2531,9 @@ "aws-synthetics-canary.json", "aws-synthetics-group.json", "aws-systemsmanagersap-application.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/eu_central_1/aws-ce-anomalymonitor.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ce-anomalymonitor.json new file mode 100644 index 0000000000..1e45809f4c --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ce-anomalymonitor.json @@ -0,0 +1,118 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/MonitorType", + "/properties/MonitorDimension", + "/properties/MonitorSpecification", + "/properties/ResourceTags" + ], + "definitions": { + "Arn": { + "pattern": "^arn:aws[-a-z0-9]*:[a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+$", + "type": "string" + }, + "ResourceTag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "pattern": "^(?!aws:).*$", + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$", + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/MonitorArn" + ], + "properties": { + "CreationDate": { + "maxLength": 40, + "minLength": 0, + "pattern": "(\\d{4}-\\d{2}-\\d{2})(T\\d{2}:\\d{2}:\\d{2}Z)?", + "type": "string" + }, + "DimensionalValueCount": { + "minimum": 0, + "type": "integer" + }, + "LastEvaluatedDate": { + "maxLength": 40, + "minLength": 0, + "pattern": "(\\d{4}-\\d{2}-\\d{2})(T\\d{2}:\\d{2}:\\d{2}Z)?|(NOT_EVALUATED_YET)", + "type": "string" + }, + "LastUpdatedDate": { + "maxLength": 40, + "minLength": 0, + "pattern": "(\\d{4}-\\d{2}-\\d{2})(T\\d{2}:\\d{2}:\\d{2}Z)?", + "type": "string" + }, + "MonitorArn": { + "$ref": "#/definitions/Arn" + }, + "MonitorDimension": { + "enum": [ + "SERVICE" + ], + "type": "string" + }, + "MonitorName": { + "maxLength": 1024, + "minLength": 0, + "pattern": "[\\S\\s]*", + "type": "string" + }, + "MonitorSpecification": { + "type": "string" + }, + "MonitorType": { + "enum": [ + "DIMENSIONAL", + "CUSTOM" + ], + "type": "string" + }, + "ResourceTags": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/ResourceTag" + }, + "maxItems": 200, + "minItems": 0, + "type": "array" + } + }, + "readOnlyProperties": [ + "/properties/MonitorArn", + "/properties/CreationDate", + "/properties/LastEvaluatedDate", + "/properties/LastUpdatedDate", + "/properties/DimensionalValueCount" + ], + "required": [ + "MonitorName", + "MonitorType" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/ResourceTags", + "tagUpdatable": false, + "taggable": true + }, + "typeName": "AWS::CE::AnomalyMonitor" +} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ce-anomalysubscription.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ce-anomalysubscription.json new file mode 100644 index 0000000000..652fa9b4a5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ce-anomalysubscription.json @@ -0,0 +1,139 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/ResourceTags" + ], + "definitions": { + "Arn": { + "pattern": "^arn:aws[-a-z0-9]*:[a-z0-9]+:[-a-z0-9]*:[0-9]{12}:[-a-zA-Z0-9/:_]+$", + "type": "string" + }, + "ResourceTag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "pattern": "^(?!aws:).*$", + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$", + "type": "string" + } + }, + "required": [ + "Key", + "Value" + ], + "type": "object" + }, + "Subscriber": { + "additionalProperties": false, + "properties": { + "Address": { + "pattern": "(^[a-zA-Z0-9.!#$%&'*+=?^_\u2018{|}~-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$)|(^arn:(aws[a-zA-Z-]*):sns:[a-zA-Z0-9-]+:[0-9]{12}:[a-zA-Z0-9_-]+(\\.fifo)?$)", + "type": "string" + }, + "Status": { + "enum": [ + "CONFIRMED", + "DECLINED" + ], + "type": "string" + }, + "Type": { + "enum": [ + "EMAIL", + "SNS" + ], + "type": "string" + } + }, + "required": [ + "Address", + "Type" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/SubscriptionArn" + ], + "properties": { + "AccountId": { + "maxLength": 1024, + "minLength": 0, + "type": "string" + }, + "Frequency": { + "enum": [ + "DAILY", + "IMMEDIATE", + "WEEKLY" + ], + "type": "string" + }, + "MonitorArnList": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Arn" + }, + "type": "array" + }, + "ResourceTags": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/ResourceTag" + }, + "maxItems": 200, + "minItems": 0, + "type": "array" + }, + "Subscribers": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/Subscriber" + }, + "type": "array" + }, + "SubscriptionArn": { + "$ref": "#/definitions/Arn" + }, + "SubscriptionName": { + "maxLength": 1024, + "minLength": 0, + "pattern": "[\\S\\s]*", + "type": "string" + }, + "Threshold": { + "minimum": 0, + "type": "number" + }, + "ThresholdExpression": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/SubscriptionArn", + "/properties/AccountId", + "/properties/Subscribers/*/Status" + ], + "required": [ + "MonitorArnList", + "Subscribers", + "Frequency", + "SubscriptionName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/ResourceTags", + "tagUpdatable": false, + "taggable": true + }, + "typeName": "AWS::CE::AnomalySubscription" +} diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-mediaconnect-flow.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-mediaconnect-flow.json similarity index 85% rename from src/cfnlint/data/schemas/providers/eu_west_1/aws-mediaconnect-flow.json rename to src/cfnlint/data/schemas/providers/eu_central_1/aws-mediaconnect-flow.json index 113156efe8..107cc06e52 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-mediaconnect-flow.json +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-mediaconnect-flow.json @@ -6,31 +6,6 @@ "/properties/Source/Name" ], "definitions": { - "AudioMonitoringSetting": { - "additionalProperties": false, - "properties": { - "SilentAudio": { - "$ref": "#/definitions/SilentAudio" - } - }, - "type": "object" - }, - "BlackFrames": { - "additionalProperties": false, - "properties": { - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThresholdSeconds": { - "type": "integer" - } - }, - "type": "object" - }, "Encryption": { "additionalProperties": false, "properties": { @@ -170,22 +145,6 @@ }, "type": "object" }, - "FrozenFrames": { - "additionalProperties": false, - "properties": { - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThresholdSeconds": { - "type": "integer" - } - }, - "type": "object" - }, "GatewayBridgeSource": { "additionalProperties": false, "properties": { @@ -341,22 +300,6 @@ ], "type": "object" }, - "SilentAudio": { - "additionalProperties": false, - "properties": { - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThresholdSeconds": { - "type": "integer" - } - }, - "type": "object" - }, "Source": { "additionalProperties": false, "properties": { @@ -446,45 +389,17 @@ "SourceMonitoringConfig": { "additionalProperties": false, "properties": { - "AudioMonitoringSettings": { - "items": { - "$ref": "#/definitions/AudioMonitoringSetting" - }, - "type": "array" - }, - "ContentQualityAnalysisState": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, "ThumbnailState": { "enum": [ "ENABLED", "DISABLED" ], "type": "string" - }, - "VideoMonitoringSettings": { - "items": { - "$ref": "#/definitions/VideoMonitoringSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "VideoMonitoringSetting": { - "additionalProperties": false, - "properties": { - "BlackFrames": { - "$ref": "#/definitions/BlackFrames" - }, - "FrozenFrames": { - "$ref": "#/definitions/FrozenFrames" } }, + "required": [ + "ThumbnailState" + ], "type": "object" }, "VpcInterface": { diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-pcs-cluster.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-pcs-cluster.json deleted file mode 100644 index 0eb3ff4219..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-pcs-cluster.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Networking", - "/properties/Scheduler", - "/properties/Size", - "/properties/SlurmConfiguration" - ], - "definitions": { - "AuthKey": { - "additionalProperties": false, - "properties": { - "SecretArn": { - "type": "string" - }, - "SecretVersion": { - "type": "string" - } - }, - "required": [ - "SecretArn", - "SecretVersion" - ], - "type": "object" - }, - "Endpoint": { - "additionalProperties": false, - "properties": { - "Port": { - "type": "string" - }, - "PrivateIpAddress": { - "type": "string" - }, - "PublicIpAddress": { - "type": "string" - }, - "Type": { - "enum": [ - "SLURMCTLD", - "SLURMDBD" - ], - "type": "string" - } - }, - "required": [ - "Port", - "PrivateIpAddress", - "Type" - ], - "type": "object" - }, - "ErrorInfo": { - "additionalProperties": false, - "properties": { - "Code": { - "type": "string" - }, - "Message": { - "type": "string" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "sg-\\w{8,17}", - "type": "string" - }, - "SlurmCustomSetting": { - "additionalProperties": false, - "properties": { - "ParameterName": { - "type": "string" - }, - "ParameterValue": { - "type": "string" - } - }, - "required": [ - "ParameterName", - "ParameterValue" - ], - "type": "object" - }, - "SubnetId": { - "pattern": "subnet-\\w{8,17}", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Endpoints": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Endpoint" - }, - "type": "array" - }, - "ErrorInfo": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ErrorInfo" - }, - "type": "array" - }, - "Id": { - "pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{1,40})$", - "type": "string" - }, - "Name": { - "type": "string" - }, - "Networking": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array" - } - }, - "type": "object" - }, - "Scheduler": { - "additionalProperties": false, - "properties": { - "Type": { - "enum": [ - "SLURM" - ], - "type": "string" - }, - "Version": { - "type": "string" - } - }, - "required": [ - "Type", - "Version" - ], - "type": "object" - }, - "Size": { - "enum": [ - "SMALL", - "MEDIUM", - "LARGE" - ], - "type": "string" - }, - "SlurmConfiguration": { - "additionalProperties": false, - "properties": { - "AuthKey": { - "$ref": "#/definitions/AuthKey" - }, - "ScaleDownIdleTimeInSeconds": { - "minimum": 1, - "type": "integer" - }, - "SlurmCustomSettings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SlurmCustomSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "Status": { - "enum": [ - "CREATING", - "ACTIVE", - "UPDATING", - "DELETING", - "CREATE_FAILED", - "DELETE_FAILED", - "UPDATE_FAILED" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - "^.+$": { - "type": "string" - } - } - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Endpoints", - "/properties/ErrorInfo", - "/properties/Id", - "/properties/Status" - ], - "required": [ - "Networking", - "Scheduler", - "Size" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-pcs.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::PCS::Cluster" -} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ssm-resourcedatasync.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ssm-resourcedatasync.json new file mode 100644 index 0000000000..5f5b7df9f3 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ssm-resourcedatasync.json @@ -0,0 +1,156 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/KMSKeyArn", + "/properties/SyncFormat", + "/properties/BucketPrefix", + "/properties/SyncName", + "/properties/BucketRegion", + "/properties/BucketName", + "/properties/S3Destination", + "/properties/SyncType" + ], + "definitions": { + "AwsOrganizationsSource": { + "additionalProperties": false, + "properties": { + "OrganizationSourceType": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "OrganizationalUnits": { + "items": { + "type": "string" + }, + "type": "array", + "uniqueItems": false + } + }, + "required": [ + "OrganizationSourceType" + ], + "type": "object" + }, + "S3Destination": { + "additionalProperties": false, + "properties": { + "BucketName": { + "maxLength": 2048, + "minLength": 1, + "type": "string" + }, + "BucketPrefix": { + "maxLength": 256, + "minLength": 1, + "type": "string" + }, + "BucketRegion": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "KMSKeyArn": { + "maxLength": 512, + "minLength": 1, + "type": "string" + }, + "SyncFormat": { + "enum": [ + "JsonSerDe" + ], + "maxLength": 1024, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "BucketName", + "BucketRegion", + "SyncFormat" + ], + "type": "object" + }, + "SyncSource": { + "additionalProperties": false, + "properties": { + "AwsOrganizationsSource": { + "$ref": "#/definitions/AwsOrganizationsSource" + }, + "IncludeFutureRegions": { + "type": "boolean" + }, + "SourceRegions": { + "items": { + "type": "string" + }, + "type": "array", + "uniqueItems": false + }, + "SourceType": { + "maxLength": 64, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "SourceType", + "SourceRegions" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/SyncName" + ], + "properties": { + "BucketName": { + "maxLength": 2048, + "minLength": 1, + "type": "string" + }, + "BucketPrefix": { + "maxLength": 64, + "minLength": 0, + "type": "string" + }, + "BucketRegion": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "KMSKeyArn": { + "maxLength": 512, + "minLength": 0, + "type": "string" + }, + "S3Destination": { + "$ref": "#/definitions/S3Destination" + }, + "SyncFormat": { + "maxLength": 1024, + "minLength": 0, + "type": "string" + }, + "SyncName": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "SyncSource": { + "$ref": "#/definitions/SyncSource" + }, + "SyncType": { + "maxLength": 64, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "SyncName" + ], + "tagging": { + "taggable": false + }, + "typeName": "AWS::SSM::ResourceDataSync" +} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-database.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-database.json deleted file mode 100644 index f265e604f9..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-database.json +++ /dev/null @@ -1,61 +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", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::Timestream::Database" -} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-table.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-table.json deleted file mode 100644 index d5e6d3f7bf..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-table.json +++ /dev/null @@ -1,175 +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", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::Timestream::Table" -} diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py index af5afc4025..9e3fc312f7 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py @@ -721,6 +721,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", @@ -863,7 +864,6 @@ "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", @@ -919,7 +919,6 @@ "aws-dms-replicationconfig.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnroute.json", "aws-ec2-clientvpntargetnetworkassociation.json", @@ -992,7 +991,6 @@ "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-ecr-pullthroughcacherule.json", @@ -1052,7 +1050,6 @@ "aws-eventschemas-registrypolicy.json", "aws-eventschemas-schema.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-snapshot.json", @@ -1154,6 +1151,7 @@ "aws-msk-configuration.json", "aws-msk-vpcconnection.json", "aws-mwaa-environment.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", @@ -1251,6 +1249,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_2/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_2/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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_central_2/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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_central_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_central_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_2/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/eu_central_2/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_2/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/eu_central_2/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} 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 25534ed1ee..5e053823e1 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py @@ -1200,7 +1200,6 @@ "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", @@ -1302,7 +1301,6 @@ "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", @@ -1393,7 +1391,6 @@ "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", @@ -1470,7 +1467,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1640,7 +1636,9 @@ "aws-logs-transformer.json", "aws-lookoutmetrics-alert.json", "aws-lookoutmetrics-anomalydetector.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", @@ -1922,6 +1920,7 @@ "aws-servicediscovery-privatednsnamespace.json", "aws-servicediscovery-publicdnsnamespace.json", "aws-servicediscovery-service.json", + "aws-ses-configurationset.json", "aws-ses-configurationseteventdestination.json", "aws-ses-contactlist.json", "aws-ses-dedicatedippool.json", @@ -1958,7 +1957,6 @@ "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", @@ -1974,7 +1972,6 @@ "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_north_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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 new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_north_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/eu_north_1/aws-m2-application.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ses-configurationset.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ses-configurationset.json deleted file mode 100644 index 548640372c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ses-configurationset.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name" - ], - "definitions": { - "DashboardOptions": { - "additionalProperties": false, - "properties": { - "EngagementMetrics": { - "pattern": "ENABLED|DISABLED", - "type": "string" - } - }, - "required": [ - "EngagementMetrics" - ], - "type": "object" - }, - "DeliveryOptions": { - "additionalProperties": false, - "properties": { - "MaxDeliverySeconds": { - "maximum": 50400, - "minimum": 300, - "type": "number" - }, - "SendingPoolName": { - "type": "string" - }, - "TlsPolicy": { - "pattern": "REQUIRE|OPTIONAL", - "type": "string" - } - }, - "type": "object" - }, - "GuardianOptions": { - "additionalProperties": false, - "properties": { - "OptimizedSharedDelivery": { - "pattern": "ENABLED|DISABLED", - "type": "string" - } - }, - "required": [ - "OptimizedSharedDelivery" - ], - "type": "object" - }, - "ReputationOptions": { - "additionalProperties": false, - "properties": { - "ReputationMetricsEnabled": { - "pattern": "true|false", - "type": "boolean" - } - }, - "type": "object" - }, - "SendingOptions": { - "additionalProperties": false, - "properties": { - "SendingEnabled": { - "pattern": "true|false", - "type": "boolean" - } - }, - "type": "object" - }, - "SuppressionOptions": { - "additionalProperties": false, - "properties": { - "SuppressedReasons": { - "insertionOrder": false, - "items": { - "pattern": "BOUNCE|COMPLAINT", - "type": "string" - }, - "type": "array", - "uniqueItems": false - } - }, - "type": "object" - }, - "TrackingOptions": { - "additionalProperties": false, - "properties": { - "CustomRedirectDomain": { - "type": "string" - } - }, - "type": "object" - }, - "VdmOptions": { - "additionalProperties": false, - "properties": { - "DashboardOptions": { - "$ref": "#/definitions/DashboardOptions" - }, - "GuardianOptions": { - "$ref": "#/definitions/GuardianOptions" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name" - ], - "properties": { - "DeliveryOptions": { - "$ref": "#/definitions/DeliveryOptions" - }, - "Name": { - "pattern": "^[a-zA-Z0-9_-]{1,64}$", - "type": "string" - }, - "ReputationOptions": { - "$ref": "#/definitions/ReputationOptions" - }, - "SendingOptions": { - "$ref": "#/definitions/SendingOptions" - }, - "SuppressionOptions": { - "$ref": "#/definitions/SuppressionOptions" - }, - "TrackingOptions": { - "$ref": "#/definitions/TrackingOptions" - }, - "VdmOptions": { - "$ref": "#/definitions/VdmOptions" - } - }, - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ses.git", - "taggable": false, - "typeName": "AWS::SES::ConfigurationSet" -} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ssmincidents-replicationset.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ssmincidents-replicationset.json similarity index 97% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-ssmincidents-replicationset.json rename to src/cfnlint/data/schemas/providers/eu_north_1/aws-ssmincidents-replicationset.json index aeda64f3be..f2d65585be 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ssmincidents-replicationset.json +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ssmincidents-replicationset.json @@ -13,8 +13,7 @@ "additionalProperties": false, "properties": { "SseKmsKeyId": { - "maxLength": 2048, - "type": "string" + "$ref": "#/definitions/Arn" } }, "required": [ diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json similarity index 95% rename from src/cfnlint/data/schemas/providers/ap_southeast_2/aws-timestream-influxdbinstance.json rename to src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json index bfd94ca75f..0ca36fcc35 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-timestream-influxdbinstance.json +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json @@ -6,11 +6,13 @@ "/properties/Password", "/properties/Organization", "/properties/Bucket", + "/properties/DbInstanceType", "/properties/VpcSubnetIds", "/properties/VpcSecurityGroupIds", "/properties/PubliclyAccessible", "/properties/DbStorageType", - "/properties/AllocatedStorage" + "/properties/AllocatedStorage", + "/properties/DeploymentType" ], "definitions": { "Tag": { @@ -135,7 +137,7 @@ "Name": { "maxLength": 40, "minLength": 3, - "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", + "pattern": "^[a-zA-z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", "type": "string" }, "Organization": { @@ -149,11 +151,6 @@ "pattern": "^[a-zA-Z0-9]+$", "type": "string" }, - "Port": { - "maximum": 65535, - "minimum": 1024, - "type": "integer" - }, "PubliclyAccessible": { "default": false, "type": "boolean" @@ -168,8 +165,6 @@ "DELETING", "MODIFYING", "UPDATING", - "UPDATING_DEPLOYMENT_TYPE", - "UPDATING_INSTANCE_TYPE", "DELETED", "FAILED" ], 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 1d710fa514..ab14693fa2 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py @@ -982,7 +982,6 @@ "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", @@ -1068,7 +1067,6 @@ "aws-docdbelastic-cluster.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnroute.json", "aws-ec2-clientvpntargetnetworkassociation.json", @@ -1155,7 +1153,6 @@ "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", @@ -1225,7 +1222,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-snapshot.json", @@ -1330,7 +1326,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-session.json", "aws-msk-batchscramsecret.json", @@ -1339,6 +1337,7 @@ "aws-msk-configuration.json", "aws-msk-vpcconnection.json", "aws-mwaa-environment.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", @@ -1414,7 +1413,6 @@ "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", @@ -1432,6 +1430,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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_south_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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_south_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_south_1/aws-emrserverless-application.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-emrserverless-application.json deleted file mode 100644 index 1d2c5c86ed..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-emrserverless-application.json +++ /dev/null @@ -1,556 +0,0 @@ -{ - "additionalProperties": false, - "conditionalCreateOnlyProperties": [ - "/properties/Architecture", - "/properties/ReleaseLabel", - "/properties/WorkerTypeSpecifications", - "/properties/MaximumCapacity", - "/properties/InitialCapacity", - "/properties/AutoStartConfiguration", - "/properties/AutoStopConfiguration", - "/properties/NetworkConfiguration", - "/properties/ImageConfiguration", - "/properties/MonitoringConfiguration", - "/properties/RuntimeConfiguration", - "/properties/InteractiveConfiguration", - "/properties/SchedulerConfiguration" - ], - "createOnlyProperties": [ - "/properties/Name", - "/properties/Type" - ], - "definitions": { - "Architecture": { - "enum": [ - "ARM64", - "X86_64" - ], - "type": "string" - }, - "AutoStartConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": true, - "type": "boolean" - } - }, - "required": [], - "type": "object" - }, - "AutoStopConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": true, - "type": "boolean" - }, - "IdleTimeoutMinutes": { - "type": "integer" - } - }, - "required": [], - "type": "object" - }, - "Classification": { - "maxLength": 1024, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "CloudWatchLoggingConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": false, - "type": "boolean" - }, - "EncryptionKeyArn": { - "$ref": "#/definitions/EncryptionKeyArn" - }, - "LogGroupName": { - "$ref": "#/definitions/LogGroupName" - }, - "LogStreamNamePrefix": { - "$ref": "#/definitions/LogStreamNamePrefix" - }, - "LogTypeMap": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/LogTypeMapKeyValuePair" - }, - "type": "array", - "uniqueItems": true - } - } - }, - "ConfigurationList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ConfigurationObject" - }, - "type": "array", - "uniqueItems": true - }, - "ConfigurationObject": { - "additionalProperties": false, - "properties": { - "Classification": { - "$ref": "#/definitions/Classification" - }, - "Configurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ConfigurationObject" - }, - "type": "array", - "uniqueItems": true - }, - "Properties": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z]+[-a-zA-Z0-9_.]*$": { - "$ref": "#/definitions/SensitivePropertiesMap" - } - }, - "type": "object" - } - }, - "required": [ - "Classification" - ], - "type": "object" - }, - "CpuSize": { - "maxLength": 15, - "minLength": 1, - "pattern": "^[1-9][0-9]*(\\s)?(vCPU|vcpu|VCPU)?$", - "type": "string" - }, - "DiskSize": { - "maxLength": 15, - "minLength": 1, - "pattern": "^[1-9][0-9]*(\\s)?(GB|gb|gB|Gb)$", - "type": "string" - }, - "DiskType": { - "pattern": "^(SHUFFLE_OPTIMIZED|[Ss]huffle_[Oo]ptimized|STANDARD|[Ss]tandard)$", - "type": "string" - }, - "EncryptionKeyArn": { - "maxLength": 2048, - "minLength": 20, - "pattern": "^arn:(aws[a-zA-Z0-9-]*):kms:[a-zA-Z0-9\\-]*:(\\d{12})?:key\\/[a-zA-Z0-9-]+$", - "type": "string" - }, - "ImageConfigurationInput": { - "additionalProperties": false, - "properties": { - "ImageUri": { - "maxLength": 1024, - "minLength": 1, - "pattern": "^([a-z0-9]+[a-z0-9-.]*)\\/((?:[a-z0-9]+(?:[._-][a-z0-9]+)*\\/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)(?:\\:([a-zA-Z0-9_][a-zA-Z0-9-._]{0,299})|@(sha256:[0-9a-f]{64}))$", - "type": "string" - } - }, - "type": "object" - }, - "InitialCapacityConfig": { - "additionalProperties": false, - "properties": { - "WorkerConfiguration": { - "$ref": "#/definitions/WorkerConfiguration" - }, - "WorkerCount": { - "format": "int64", - "maximum": 1000000, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "WorkerCount", - "WorkerConfiguration" - ], - "type": "object" - }, - "InitialCapacityConfigKeyValuePair": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 50, - "minLength": 1, - "pattern": "^[a-zA-Z]+[-_]*[a-zA-Z]+$", - "type": "string" - }, - "Value": { - "$ref": "#/definitions/InitialCapacityConfig" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "InitialCapacityConfigMap": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/InitialCapacityConfigKeyValuePair" - }, - "type": "array", - "uniqueItems": true - }, - "InteractiveConfiguration": { - "additionalProperties": false, - "properties": { - "LivyEndpointEnabled": { - "default": false, - "type": "boolean" - }, - "StudioEnabled": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "LogGroupName": { - "format": "AWS::Logs::LogGroup.Name", - "maxLength": 512, - "minLength": 1, - "pattern": "^[\\.\\-_/#A-Za-z0-9]+$", - "type": "string" - }, - "LogStreamNamePrefix": { - "maxLength": 512, - "minLength": 1, - "pattern": "^[^:*]*$", - "type": "string" - }, - "LogTypeList": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/LogTypeString" - }, - "maxItems": 5, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "LogTypeMapKeyValuePair": { - "additionalProperties": false, - "properties": { - "Key": { - "$ref": "#/definitions/WorkerTypeString" - }, - "Value": { - "$ref": "#/definitions/LogTypeList" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "LogTypeString": { - "maxLength": 50, - "minLength": 1, - "pattern": "^[a-zA-Z]+[-_]*[a-zA-Z]+$", - "type": "string" - }, - "ManagedPersistenceMonitoringConfiguration": { - "additionalProperties": false, - "properties": { - "Enabled": { - "default": true, - "type": "boolean" - }, - "EncryptionKeyArn": { - "$ref": "#/definitions/EncryptionKeyArn" - } - } - }, - "MaximumAllowedResources": { - "additionalProperties": false, - "properties": { - "Cpu": { - "$ref": "#/definitions/CpuSize" - }, - "Disk": { - "$ref": "#/definitions/DiskSize" - }, - "Memory": { - "$ref": "#/definitions/MemorySize" - } - }, - "required": [ - "Cpu", - "Memory" - ], - "type": "object" - }, - "MemorySize": { - "maxLength": 15, - "minLength": 1, - "pattern": "^[1-9][0-9]*(\\s)?(GB|gb|gB|Gb)?$", - "type": "string" - }, - "MonitoringConfiguration": { - "additionalProperties": false, - "properties": { - "CloudWatchLoggingConfiguration": { - "$ref": "#/definitions/CloudWatchLoggingConfiguration" - }, - "ManagedPersistenceMonitoringConfiguration": { - "$ref": "#/definitions/ManagedPersistenceMonitoringConfiguration" - }, - "S3MonitoringConfiguration": { - "$ref": "#/definitions/S3MonitoringConfiguration" - } - }, - "type": "object" - }, - "NetworkConfiguration": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "maxItems": 5, - "minItems": 1, - "type": "array", - "uniqueItems": true - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "maxItems": 16, - "minItems": 1, - "type": "array", - "uniqueItems": true - } - }, - "required": [], - "type": "object" - }, - "S3MonitoringConfiguration": { - "additionalProperties": false, - "properties": { - "EncryptionKeyArn": { - "$ref": "#/definitions/EncryptionKeyArn" - }, - "LogUri": { - "$ref": "#/definitions/UriString" - } - } - }, - "SchedulerConfiguration": { - "additionalProperties": false, - "properties": { - "MaxConcurrentRuns": { - "type": "integer" - }, - "QueueTimeoutMinutes": { - "type": "integer" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "maxLength": 32, - "minLength": 1, - "pattern": "[-0-9a-zA-Z]+.*", - "type": "string" - }, - "SensitivePropertiesKeyValuePair": { - "maxLength": 1024, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "SensitivePropertiesMap": { - "maxLength": 1024, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "SubnetId": { - "maxLength": 32, - "minLength": 1, - "pattern": "[-0-9a-zA-Z]+.*", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^[A-Za-z0-9 /_.:=+@-]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[A-Za-z0-9 /_.:=+@-]*$", - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "UriString": { - "maxLength": 10280, - "minLength": 1, - "pattern": "[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDBFF-\\uDC00\\uDFFF\\r\\n\\t]*", - "type": "string" - }, - "WorkerConfiguration": { - "additionalProperties": false, - "properties": { - "Cpu": { - "$ref": "#/definitions/CpuSize" - }, - "Disk": { - "$ref": "#/definitions/DiskSize" - }, - "DiskType": { - "$ref": "#/definitions/DiskType" - }, - "Memory": { - "$ref": "#/definitions/MemorySize" - } - }, - "required": [ - "Cpu", - "Memory" - ], - "type": "object" - }, - "WorkerTypeSpecificationInput": { - "additionalProperties": false, - "properties": { - "ImageConfiguration": { - "$ref": "#/definitions/ImageConfigurationInput" - } - }, - "type": "object" - }, - "WorkerTypeSpecificationInputMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z]+[-_]*[a-zA-Z]+$": { - "$ref": "#/definitions/WorkerTypeSpecificationInput" - } - }, - "type": "object" - }, - "WorkerTypeString": { - "maxLength": 50, - "minLength": 1, - "pattern": "^[a-zA-Z]+[-_]*[a-zA-Z]+$", - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationId" - ], - "properties": { - "ApplicationId": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "Architecture": { - "$ref": "#/definitions/Architecture" - }, - "Arn": { - "pattern": "^arn:(aws[a-zA-Z0-9-]*):emr-serverless:.+:(\\d{12}):\\/applications\\/[0-9a-zA-Z]+$", - "type": "string" - }, - "AutoStartConfiguration": { - "$ref": "#/definitions/AutoStartConfiguration" - }, - "AutoStopConfiguration": { - "$ref": "#/definitions/AutoStopConfiguration" - }, - "ImageConfiguration": { - "$ref": "#/definitions/ImageConfigurationInput" - }, - "InitialCapacity": { - "$ref": "#/definitions/InitialCapacityConfigMap" - }, - "InteractiveConfiguration": { - "$ref": "#/definitions/InteractiveConfiguration" - }, - "MaximumCapacity": { - "$ref": "#/definitions/MaximumAllowedResources" - }, - "MonitoringConfiguration": { - "$ref": "#/definitions/MonitoringConfiguration" - }, - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": "^[A-Za-z0-9._\\/#-]+$", - "type": "string" - }, - "NetworkConfiguration": { - "$ref": "#/definitions/NetworkConfiguration" - }, - "ReleaseLabel": { - "maxLength": 64, - "minLength": 1, - "pattern": "^[A-Za-z0-9._/-]+$", - "type": "string" - }, - "RuntimeConfiguration": { - "$ref": "#/definitions/ConfigurationList" - }, - "SchedulerConfiguration": { - "$ref": "#/definitions/SchedulerConfiguration" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array", - "uniqueItems": true - }, - "Type": { - "type": "string" - }, - "WorkerTypeSpecifications": { - "$ref": "#/definitions/WorkerTypeSpecificationInputMap" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/ApplicationId" - ], - "required": [ - "ReleaseLabel", - "Type" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::EMRServerless::Application" -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/eu_south_1/aws-m2-application.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_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/eu_south_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-resiliencehub-app.json new file mode 100644 index 0000000000..40b055a88b --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_1/aws-resiliencehub-app.json @@ -0,0 +1,222 @@ +{ + "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_south_1/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py index a4c7990bee..cc8b0076d8 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py @@ -735,6 +735,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", @@ -1006,7 +1007,6 @@ "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-ecr-pullthroughcacherule.json", @@ -1069,7 +1069,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1171,7 +1170,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-memorydb-acl.json", "aws-memorydb-parametergroup.json", "aws-memorydb-subnetgroup.json", diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_2/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_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_south_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_south_2/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/eu_south_2/aws-m2-application.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} 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 7e75070385..7dde280074 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py @@ -1287,6 +1287,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", @@ -1692,7 +1693,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", @@ -2074,6 +2074,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", @@ -2197,6 +2198,7 @@ "aws-pcaconnectorad-templategroupaccesscontrolentry.json", "aws-pcaconnectorscep-challenge.json", "aws-pcaconnectorscep-connector.json", + "aws-pcs-cluster.json", "aws-pcs-computenodegroup.json", "aws-pcs-queue.json", "aws-personalize-dataset.json", @@ -2256,6 +2258,7 @@ "aws-rds-dbproxytargetgroup.json", "aws-rds-dbsecuritygroup.json", "aws-rds-dbsecuritygroupingress.json", + "aws-rds-dbshardgroup.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", "aws-rds-globalcluster.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_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_west_1/aws-ec2-verifiedaccessendpoint.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-verifiedaccessendpoint.json new file mode 100644 index 0000000000..e89c87abee --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-ec2-verifiedaccessendpoint.json @@ -0,0 +1,324 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/ApplicationDomain", + "/properties/AttachmentType", + "/properties/DomainCertificateArn", + "/properties/EndpointDomainPrefix", + "/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" + ], + "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": { + "LoadBalancerArn": { + "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" + }, + "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" + }, + "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, + "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" + }, + "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" + }, + "CidrOptions": { + "$ref": "#/definitions/CidrOptions" + }, + "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" + }, + "RdsOptions": { + "$ref": "#/definitions/RdsOptions" + }, + "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": [ + "AttachmentType", + "EndpointType", + "VerifiedAccessGroupId" + ], + "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/eu_west_1/aws-pcs-cluster.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-pcs-cluster.json deleted file mode 100644 index 0eb3ff4219..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-pcs-cluster.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Networking", - "/properties/Scheduler", - "/properties/Size", - "/properties/SlurmConfiguration" - ], - "definitions": { - "AuthKey": { - "additionalProperties": false, - "properties": { - "SecretArn": { - "type": "string" - }, - "SecretVersion": { - "type": "string" - } - }, - "required": [ - "SecretArn", - "SecretVersion" - ], - "type": "object" - }, - "Endpoint": { - "additionalProperties": false, - "properties": { - "Port": { - "type": "string" - }, - "PrivateIpAddress": { - "type": "string" - }, - "PublicIpAddress": { - "type": "string" - }, - "Type": { - "enum": [ - "SLURMCTLD", - "SLURMDBD" - ], - "type": "string" - } - }, - "required": [ - "Port", - "PrivateIpAddress", - "Type" - ], - "type": "object" - }, - "ErrorInfo": { - "additionalProperties": false, - "properties": { - "Code": { - "type": "string" - }, - "Message": { - "type": "string" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "sg-\\w{8,17}", - "type": "string" - }, - "SlurmCustomSetting": { - "additionalProperties": false, - "properties": { - "ParameterName": { - "type": "string" - }, - "ParameterValue": { - "type": "string" - } - }, - "required": [ - "ParameterName", - "ParameterValue" - ], - "type": "object" - }, - "SubnetId": { - "pattern": "subnet-\\w{8,17}", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Endpoints": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Endpoint" - }, - "type": "array" - }, - "ErrorInfo": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ErrorInfo" - }, - "type": "array" - }, - "Id": { - "pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{1,40})$", - "type": "string" - }, - "Name": { - "type": "string" - }, - "Networking": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array" - } - }, - "type": "object" - }, - "Scheduler": { - "additionalProperties": false, - "properties": { - "Type": { - "enum": [ - "SLURM" - ], - "type": "string" - }, - "Version": { - "type": "string" - } - }, - "required": [ - "Type", - "Version" - ], - "type": "object" - }, - "Size": { - "enum": [ - "SMALL", - "MEDIUM", - "LARGE" - ], - "type": "string" - }, - "SlurmConfiguration": { - "additionalProperties": false, - "properties": { - "AuthKey": { - "$ref": "#/definitions/AuthKey" - }, - "ScaleDownIdleTimeInSeconds": { - "minimum": 1, - "type": "integer" - }, - "SlurmCustomSettings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SlurmCustomSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "Status": { - "enum": [ - "CREATING", - "ACTIVE", - "UPDATING", - "DELETING", - "CREATE_FAILED", - "DELETE_FAILED", - "UPDATE_FAILED" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - "^.+$": { - "type": "string" - } - } - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Endpoints", - "/properties/ErrorInfo", - "/properties/Id", - "/properties/Status" - ], - "required": [ - "Networking", - "Scheduler", - "Size" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-pcs.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::PCS::Cluster" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-rds-dbshardgroup.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-rds-dbshardgroup.json deleted file mode 100644 index 691fa97c30..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-rds-dbshardgroup.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DBClusterIdentifier", - "/properties/DBShardGroupIdentifier", - "/properties/PubliclyAccessible" - ], - "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/DBShardGroupIdentifier" - ], - "properties": { - "ComputeRedundancy": { - "minimum": 0, - "type": "integer" - }, - "DBClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupResourceId": { - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "MaxACU": { - "type": "number" - }, - "MinACU": { - "type": "number" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/DBClusterIdentifier": "$lowercase(DBClusterIdentifier)", - "/properties/DBShardGroupIdentifier": "$lowercase(DBShardGroupIdentifier)" - }, - "readOnlyProperties": [ - "/properties/DBShardGroupResourceId", - "/properties/Endpoint" - ], - "required": [ - "DBClusterIdentifier", - "MaxACU" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": false, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::RDS::DBShardGroup", - "writeOnlyProperties": [ - "/properties/MinACU" - ] -} 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 f7a2dee9dc..7d076671fb 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py @@ -1216,6 +1216,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", @@ -1351,8 +1352,8 @@ "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", "aws-budgets-budgetsaction.json", "aws-cassandra-keyspace.json", @@ -1659,7 +1660,6 @@ "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", @@ -1736,7 +1736,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1945,7 +1944,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", @@ -2098,6 +2099,7 @@ "aws-quicksight-refreshschedule.json", "aws-quicksight-template.json", "aws-quicksight-theme.json", + "aws-quicksight-topic.json", "aws-quicksight-vpcconnection.json", "aws-ram-permission.json", "aws-ram-resourceshare.json", @@ -2297,7 +2299,6 @@ "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_west_2/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/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/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-knowledgebase.json similarity index 99% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-bedrock-knowledgebase.json rename to src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-knowledgebase.json index 25c80e5f17..75bbdf1578 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-bedrock-knowledgebase.json +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-knowledgebase.json @@ -32,13 +32,6 @@ "maximum": 4096, "minimum": 0, "type": "integer" - }, - "EmbeddingDataType": { - "enum": [ - "FLOAT32", - "BINARY" - ], - "type": "string" } }, "type": "object" diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-promptversion.json deleted file mode 100644 index b79f1da1a7..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-bedrock-promptversion.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/PromptArn", - "/properties/Description", - "/properties/Tags" - ], - "definitions": { - "PromptInferenceConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/PromptModelInferenceConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptInputVariable": { - "additionalProperties": false, - "properties": { - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - } - }, - "type": "object" - }, - "PromptModelInferenceConfiguration": { - "additionalProperties": false, - "properties": { - "MaxTokens": { - "maximum": 4096, - "minimum": 0, - "type": "number" - }, - "StopSequences": { - "insertionOrder": true, - "items": { - "type": "string" - }, - "maxItems": 4, - "minItems": 0, - "type": "array" - }, - "Temperature": { - "maximum": 1, - "minimum": 0, - "type": "number" - }, - "TopP": { - "maximum": 1, - "minimum": 0, - "type": "number" - } - }, - "type": "object" - }, - "PromptTemplateConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/TextPromptTemplateConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptTemplateType": { - "enum": [ - "TEXT" - ], - "type": "string" - }, - "PromptVariant": { - "additionalProperties": false, - "properties": { - "InferenceConfiguration": { - "$ref": "#/definitions/PromptInferenceConfiguration" - }, - "ModelId": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$", - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "TemplateConfiguration": { - "$ref": "#/definitions/PromptTemplateConfiguration" - }, - "TemplateType": { - "$ref": "#/definitions/PromptTemplateType" - } - }, - "required": [ - "Name", - "TemplateType", - "TemplateConfiguration" - ], - "type": "object" - }, - "TagsMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z0-9\\s._:/=+@-]*$": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$", - "type": "string" - } - }, - "type": "object" - }, - "TextPromptTemplateConfiguration": { - "additionalProperties": false, - "properties": { - "InputVariables": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptInputVariable" - }, - "maxItems": 5, - "minItems": 0, - "type": "array" - }, - "Text": { - "maxLength": 200000, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Text" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}:[0-9]{1,20})$", - "type": "string" - }, - "CreatedAt": { - "format": "date-time", - "type": "string" - }, - "CustomerEncryptionKeyArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$", - "type": "string" - }, - "DefaultVariant": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "Description": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "PromptArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10})$", - "type": "string" - }, - "PromptId": { - "pattern": "^[0-9a-zA-Z]{10}$", - "type": "string" - }, - "Tags": { - "$ref": "#/definitions/TagsMap" - }, - "UpdatedAt": { - "format": "date-time", - "type": "string" - }, - "Variants": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptVariant" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "Version": { - "maxLength": 5, - "minLength": 1, - "pattern": "^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreatedAt", - "/properties/PromptId", - "/properties/UpdatedAt", - "/properties/Version", - "/properties/Name", - "/properties/DefaultVariant", - "/properties/Variants", - "/properties/CustomerEncryptionKeyArn" - ], - "required": [ - "PromptArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-prompts", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": false, - "taggable": true - }, - "typeName": "AWS::Bedrock::PromptVersion" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_west_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/eu_west_2/aws-m2-application.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-quicksight-topic.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-quicksight-topic.json deleted file mode 100644 index fa7c6e063b..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-quicksight-topic.json +++ /dev/null @@ -1,1002 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/AwsAccountId", - "/properties/FolderArns", - "/properties/TopicId" - ], - "definitions": { - "AggregationFunctionParameters": { - "additionalProperties": false, - "patternProperties": { - ".+": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "AuthorSpecifiedAggregation": { - "enum": [ - "COUNT", - "DISTINCT_COUNT", - "MIN", - "MAX", - "MEDIAN", - "SUM", - "AVERAGE", - "STDEV", - "STDEVP", - "VAR", - "VARP", - "PERCENTILE" - ], - "type": "string" - }, - "CategoryFilterFunction": { - "enum": [ - "EXACT", - "CONTAINS" - ], - "type": "string" - }, - "CategoryFilterType": { - "enum": [ - "CUSTOM_FILTER", - "CUSTOM_FILTER_LIST", - "FILTER_LIST" - ], - "type": "string" - }, - "CellValueSynonym": { - "additionalProperties": false, - "properties": { - "CellValue": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Synonyms": { - "items": { - "type": "string" - }, - "type": "array" - } - }, - "type": "object" - }, - "CollectiveConstant": { - "additionalProperties": false, - "properties": { - "ValueList": { - "items": { - "type": "string" - }, - "type": "array" - } - }, - "type": "object" - }, - "ColumnDataRole": { - "enum": [ - "DIMENSION", - "MEASURE" - ], - "type": "string" - }, - "ColumnOrderingType": { - "enum": [ - "GREATER_IS_BETTER", - "LESSER_IS_BETTER", - "SPECIFIED" - ], - "type": "string" - }, - "ComparativeOrder": { - "additionalProperties": false, - "properties": { - "SpecifedOrder": { - "items": { - "type": "string" - }, - "type": "array" - }, - "TreatUndefinedSpecifiedValues": { - "$ref": "#/definitions/UndefinedSpecifiedValueType" - }, - "UseOrdering": { - "$ref": "#/definitions/ColumnOrderingType" - } - }, - "type": "object" - }, - "ConstantType": { - "enum": [ - "SINGULAR", - "RANGE", - "COLLECTIVE" - ], - "type": "string" - }, - "DataAggregation": { - "additionalProperties": false, - "properties": { - "DatasetRowDateGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - }, - "DefaultDateColumnName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "DatasetMetadata": { - "additionalProperties": false, - "properties": { - "CalculatedFields": { - "items": { - "$ref": "#/definitions/TopicCalculatedField" - }, - "type": "array" - }, - "Columns": { - "items": { - "$ref": "#/definitions/TopicColumn" - }, - "type": "array" - }, - "DataAggregation": { - "$ref": "#/definitions/DataAggregation" - }, - "DatasetArn": { - "type": "string" - }, - "DatasetDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "DatasetName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Filters": { - "items": { - "$ref": "#/definitions/TopicFilter" - }, - "type": "array" - }, - "NamedEntities": { - "items": { - "$ref": "#/definitions/TopicNamedEntity" - }, - "type": "array" - } - }, - "required": [ - "DatasetArn" - ], - "type": "object" - }, - "DefaultAggregation": { - "enum": [ - "SUM", - "MAX", - "MIN", - "COUNT", - "DISTINCT_COUNT", - "AVERAGE", - "MEDIAN", - "STDEV", - "STDEVP", - "VAR", - "VARP" - ], - "type": "string" - }, - "DefaultFormatting": { - "additionalProperties": false, - "properties": { - "DisplayFormat": { - "$ref": "#/definitions/DisplayFormat" - }, - "DisplayFormatOptions": { - "$ref": "#/definitions/DisplayFormatOptions" - } - }, - "type": "object" - }, - "DisplayFormat": { - "enum": [ - "AUTO", - "PERCENT", - "CURRENCY", - "NUMBER", - "DATE", - "STRING" - ], - "type": "string" - }, - "DisplayFormatOptions": { - "additionalProperties": false, - "properties": { - "BlankCellFormat": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "CurrencySymbol": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "DateFormat": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "DecimalSeparator": { - "$ref": "#/definitions/TopicNumericSeparatorSymbol" - }, - "FractionDigits": { - "default": 0, - "type": "number" - }, - "GroupingSeparator": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "NegativeFormat": { - "$ref": "#/definitions/NegativeFormat" - }, - "Prefix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Suffix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "UnitScaler": { - "$ref": "#/definitions/NumberScale" - }, - "UseBlankCellFormat": { - "default": false, - "type": "boolean" - }, - "UseGrouping": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "FilterClass": { - "enum": [ - "ENFORCED_VALUE_FILTER", - "CONDITIONAL_VALUE_FILTER", - "NAMED_VALUE_FILTER" - ], - "type": "string" - }, - "NamedEntityAggType": { - "enum": [ - "SUM", - "MIN", - "MAX", - "COUNT", - "AVERAGE", - "DISTINCT_COUNT", - "STDEV", - "STDEVP", - "VAR", - "VARP", - "PERCENTILE", - "MEDIAN", - "CUSTOM" - ], - "type": "string" - }, - "NamedEntityDefinition": { - "additionalProperties": false, - "properties": { - "FieldName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Metric": { - "$ref": "#/definitions/NamedEntityDefinitionMetric" - }, - "PropertyName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "PropertyRole": { - "$ref": "#/definitions/PropertyRole" - }, - "PropertyUsage": { - "$ref": "#/definitions/PropertyUsage" - } - }, - "type": "object" - }, - "NamedEntityDefinitionMetric": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/NamedEntityAggType" - }, - "AggregationFunctionParameters": { - "$ref": "#/definitions/AggregationFunctionParameters" - } - }, - "type": "object" - }, - "NamedFilterAggType": { - "enum": [ - "NO_AGGREGATION", - "SUM", - "AVERAGE", - "COUNT", - "DISTINCT_COUNT", - "MAX", - "MEDIAN", - "MIN", - "STDEV", - "STDEVP", - "VAR", - "VARP" - ], - "type": "string" - }, - "NamedFilterType": { - "enum": [ - "CATEGORY_FILTER", - "NUMERIC_EQUALITY_FILTER", - "NUMERIC_RANGE_FILTER", - "DATE_RANGE_FILTER", - "RELATIVE_DATE_FILTER" - ], - "type": "string" - }, - "NegativeFormat": { - "additionalProperties": false, - "properties": { - "Prefix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Suffix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "NumberScale": { - "enum": [ - "NONE", - "AUTO", - "THOUSANDS", - "MILLIONS", - "BILLIONS", - "TRILLIONS" - ], - "type": "string" - }, - "PropertyRole": { - "enum": [ - "PRIMARY", - "ID" - ], - "type": "string" - }, - "PropertyUsage": { - "enum": [ - "INHERIT", - "DIMENSION", - "MEASURE" - ], - "type": "string" - }, - "RangeConstant": { - "additionalProperties": false, - "properties": { - "Maximum": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Minimum": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "SemanticEntityType": { - "additionalProperties": false, - "properties": { - "SubTypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TypeParameters": { - "$ref": "#/definitions/TypeParameters" - } - }, - "type": "object" - }, - "SemanticType": { - "additionalProperties": false, - "properties": { - "FalseyCellValue": { - "type": "string" - }, - "FalseyCellValueSynonyms": { - "items": { - "type": "string" - }, - "type": "array" - }, - "SubTypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TruthyCellValue": { - "type": "string" - }, - "TruthyCellValueSynonyms": { - "items": { - "type": "string" - }, - "type": "array" - }, - "TypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TypeParameters": { - "$ref": "#/definitions/TypeParameters" - } - }, - "type": "object" - }, - "TopicCalculatedField": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/DefaultAggregation" - }, - "AllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "CalculatedFieldDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "CalculatedFieldName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "CalculatedFieldSynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "CellValueSynonyms": { - "items": { - "$ref": "#/definitions/CellValueSynonym" - }, - "type": "array" - }, - "ColumnDataRole": { - "$ref": "#/definitions/ColumnDataRole" - }, - "ComparativeOrder": { - "$ref": "#/definitions/ComparativeOrder" - }, - "DefaultFormatting": { - "$ref": "#/definitions/DefaultFormatting" - }, - "DisableIndexing": { - "type": "boolean" - }, - "Expression": { - "maxLength": 4096, - "minLength": 1, - "type": "string" - }, - "IsIncludedInTopic": { - "default": false, - "type": "boolean" - }, - "NeverAggregateInFilter": { - "default": false, - "type": "boolean" - }, - "NonAdditive": { - "default": false, - "type": "boolean" - }, - "NotAllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "SemanticType": { - "$ref": "#/definitions/SemanticType" - }, - "TimeGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - } - }, - "required": [ - "CalculatedFieldName", - "Expression" - ], - "type": "object" - }, - "TopicCategoryFilter": { - "additionalProperties": false, - "properties": { - "CategoryFilterFunction": { - "$ref": "#/definitions/CategoryFilterFunction" - }, - "CategoryFilterType": { - "$ref": "#/definitions/CategoryFilterType" - }, - "Constant": { - "$ref": "#/definitions/TopicCategoryFilterConstant" - }, - "Inverse": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "TopicCategoryFilterConstant": { - "additionalProperties": false, - "properties": { - "CollectiveConstant": { - "$ref": "#/definitions/CollectiveConstant" - }, - "ConstantType": { - "$ref": "#/definitions/ConstantType" - }, - "SingularConstant": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "TopicColumn": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/DefaultAggregation" - }, - "AllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "CellValueSynonyms": { - "items": { - "$ref": "#/definitions/CellValueSynonym" - }, - "type": "array" - }, - "ColumnDataRole": { - "$ref": "#/definitions/ColumnDataRole" - }, - "ColumnDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "ColumnFriendlyName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "ColumnName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "ColumnSynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "ComparativeOrder": { - "$ref": "#/definitions/ComparativeOrder" - }, - "DefaultFormatting": { - "$ref": "#/definitions/DefaultFormatting" - }, - "DisableIndexing": { - "type": "boolean" - }, - "IsIncludedInTopic": { - "default": false, - "type": "boolean" - }, - "NeverAggregateInFilter": { - "default": false, - "type": "boolean" - }, - "NonAdditive": { - "default": false, - "type": "boolean" - }, - "NotAllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "SemanticType": { - "$ref": "#/definitions/SemanticType" - }, - "TimeGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - } - }, - "required": [ - "ColumnName" - ], - "type": "object" - }, - "TopicDateRangeFilter": { - "additionalProperties": false, - "properties": { - "Constant": { - "$ref": "#/definitions/TopicRangeFilterConstant" - }, - "Inclusive": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "TopicDetails": { - "additionalProperties": false, - "properties": { - "DataSets": { - "items": { - "$ref": "#/definitions/DatasetMetadata" - }, - "type": "array" - }, - "Description": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "UserExperienceVersion": { - "$ref": "#/definitions/TopicUserExperienceVersion" - } - }, - "type": "object" - }, - "TopicFilter": { - "additionalProperties": false, - "properties": { - "CategoryFilter": { - "$ref": "#/definitions/TopicCategoryFilter" - }, - "DateRangeFilter": { - "$ref": "#/definitions/TopicDateRangeFilter" - }, - "FilterClass": { - "$ref": "#/definitions/FilterClass" - }, - "FilterDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "FilterName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "FilterSynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "FilterType": { - "$ref": "#/definitions/NamedFilterType" - }, - "NumericEqualityFilter": { - "$ref": "#/definitions/TopicNumericEqualityFilter" - }, - "NumericRangeFilter": { - "$ref": "#/definitions/TopicNumericRangeFilter" - }, - "OperandFieldName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "RelativeDateFilter": { - "$ref": "#/definitions/TopicRelativeDateFilter" - } - }, - "required": [ - "FilterName", - "OperandFieldName" - ], - "type": "object" - }, - "TopicNamedEntity": { - "additionalProperties": false, - "properties": { - "Definition": { - "items": { - "$ref": "#/definitions/NamedEntityDefinition" - }, - "type": "array" - }, - "EntityDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "EntityName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "EntitySynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "SemanticEntityType": { - "$ref": "#/definitions/SemanticEntityType" - } - }, - "required": [ - "EntityName" - ], - "type": "object" - }, - "TopicNumericEqualityFilter": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/NamedFilterAggType" - }, - "Constant": { - "$ref": "#/definitions/TopicSingularFilterConstant" - } - }, - "type": "object" - }, - "TopicNumericRangeFilter": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/NamedFilterAggType" - }, - "Constant": { - "$ref": "#/definitions/TopicRangeFilterConstant" - }, - "Inclusive": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "TopicNumericSeparatorSymbol": { - "enum": [ - "COMMA", - "DOT" - ], - "type": "string" - }, - "TopicRangeFilterConstant": { - "additionalProperties": false, - "properties": { - "ConstantType": { - "$ref": "#/definitions/ConstantType" - }, - "RangeConstant": { - "$ref": "#/definitions/RangeConstant" - } - }, - "type": "object" - }, - "TopicRelativeDateFilter": { - "additionalProperties": false, - "properties": { - "Constant": { - "$ref": "#/definitions/TopicSingularFilterConstant" - }, - "RelativeDateFilterFunction": { - "$ref": "#/definitions/TopicRelativeDateFilterFunction" - }, - "TimeGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - } - }, - "type": "object" - }, - "TopicRelativeDateFilterFunction": { - "enum": [ - "PREVIOUS", - "THIS", - "LAST", - "NEXT", - "NOW" - ], - "type": "string" - }, - "TopicSingularFilterConstant": { - "additionalProperties": false, - "properties": { - "ConstantType": { - "$ref": "#/definitions/ConstantType" - }, - "SingularConstant": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "TopicTimeGranularity": { - "enum": [ - "SECOND", - "MINUTE", - "HOUR", - "DAY", - "WEEK", - "MONTH", - "QUARTER", - "YEAR" - ], - "type": "string" - }, - "TopicUserExperienceVersion": { - "enum": [ - "LEGACY", - "NEW_READER_EXPERIENCE" - ], - "type": "string" - }, - "TypeParameters": { - "additionalProperties": false, - "patternProperties": { - ".+": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "UndefinedSpecifiedValueType": { - "enum": [ - "LEAST", - "MOST" - ], - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/AwsAccountId", - "/properties/TopicId" - ], - "properties": { - "Arn": { - "type": "string" - }, - "AwsAccountId": { - "maxLength": 12, - "minLength": 12, - "pattern": "^[0-9]{12}$", - "type": "string" - }, - "DataSets": { - "items": { - "$ref": "#/definitions/DatasetMetadata" - }, - "type": "array" - }, - "Description": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "FolderArns": { - "items": { - "type": "string" - }, - "maxItems": 20, - "minItems": 0, - "type": "array" - }, - "Name": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "TopicId": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[A-Za-z0-9-_.\\\\+]*$", - "type": "string" - }, - "UserExperienceVersion": { - "$ref": "#/definitions/TopicUserExperienceVersion" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::QuickSight::Topic", - "writeOnlyProperties": [ - "/properties/FolderArns" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-ssmincidents-replicationset.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssmincidents-replicationset.json similarity index 97% rename from src/cfnlint/data/schemas/providers/ap_northeast_1/aws-ssmincidents-replicationset.json rename to src/cfnlint/data/schemas/providers/eu_west_2/aws-ssmincidents-replicationset.json index aeda64f3be..f2d65585be 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-ssmincidents-replicationset.json +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ssmincidents-replicationset.json @@ -13,8 +13,7 @@ "additionalProperties": false, "properties": { "SseKmsKeyId": { - "maxLength": 2048, - "type": "string" + "$ref": "#/definitions/Arn" } }, "required": [ diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py index c67fb37c62..391060cc03 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py @@ -1005,6 +1005,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", @@ -1128,6 +1129,7 @@ "aws-bedrock-guardrailversion.json", "aws-bedrock-knowledgebase.json", "aws-bedrock-prompt.json", + "aws-bedrock-promptversion.json", "aws-budgets-budget.json", "aws-budgets-budgetsaction.json", "aws-cassandra-keyspace.json", @@ -1367,7 +1369,6 @@ "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", @@ -1439,7 +1440,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1595,7 +1595,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_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/eu_west_3/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-bedrock-promptversion.json deleted file mode 100644 index b79f1da1a7..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-bedrock-promptversion.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/PromptArn", - "/properties/Description", - "/properties/Tags" - ], - "definitions": { - "PromptInferenceConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/PromptModelInferenceConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptInputVariable": { - "additionalProperties": false, - "properties": { - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - } - }, - "type": "object" - }, - "PromptModelInferenceConfiguration": { - "additionalProperties": false, - "properties": { - "MaxTokens": { - "maximum": 4096, - "minimum": 0, - "type": "number" - }, - "StopSequences": { - "insertionOrder": true, - "items": { - "type": "string" - }, - "maxItems": 4, - "minItems": 0, - "type": "array" - }, - "Temperature": { - "maximum": 1, - "minimum": 0, - "type": "number" - }, - "TopP": { - "maximum": 1, - "minimum": 0, - "type": "number" - } - }, - "type": "object" - }, - "PromptTemplateConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/TextPromptTemplateConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptTemplateType": { - "enum": [ - "TEXT" - ], - "type": "string" - }, - "PromptVariant": { - "additionalProperties": false, - "properties": { - "InferenceConfiguration": { - "$ref": "#/definitions/PromptInferenceConfiguration" - }, - "ModelId": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$", - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "TemplateConfiguration": { - "$ref": "#/definitions/PromptTemplateConfiguration" - }, - "TemplateType": { - "$ref": "#/definitions/PromptTemplateType" - } - }, - "required": [ - "Name", - "TemplateType", - "TemplateConfiguration" - ], - "type": "object" - }, - "TagsMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z0-9\\s._:/=+@-]*$": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$", - "type": "string" - } - }, - "type": "object" - }, - "TextPromptTemplateConfiguration": { - "additionalProperties": false, - "properties": { - "InputVariables": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptInputVariable" - }, - "maxItems": 5, - "minItems": 0, - "type": "array" - }, - "Text": { - "maxLength": 200000, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Text" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}:[0-9]{1,20})$", - "type": "string" - }, - "CreatedAt": { - "format": "date-time", - "type": "string" - }, - "CustomerEncryptionKeyArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$", - "type": "string" - }, - "DefaultVariant": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "Description": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "PromptArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10})$", - "type": "string" - }, - "PromptId": { - "pattern": "^[0-9a-zA-Z]{10}$", - "type": "string" - }, - "Tags": { - "$ref": "#/definitions/TagsMap" - }, - "UpdatedAt": { - "format": "date-time", - "type": "string" - }, - "Variants": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptVariant" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "Version": { - "maxLength": 5, - "minLength": 1, - "pattern": "^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreatedAt", - "/properties/PromptId", - "/properties/UpdatedAt", - "/properties/Version", - "/properties/Name", - "/properties/DefaultVariant", - "/properties/Variants", - "/properties/CustomerEncryptionKeyArn" - ], - "required": [ - "PromptArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-prompts", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": false, - "taggable": true - }, - "typeName": "AWS::Bedrock::PromptVersion" -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/eu_west_3/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_3/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/eu_west_3/aws-m2-application.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} 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 dd5e59a973..f879695cfc 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py @@ -847,7 +847,6 @@ "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", @@ -906,7 +905,6 @@ "aws-dms-replicationconfig.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnroute.json", "aws-ec2-clientvpntargetnetworkassociation.json", @@ -985,7 +983,6 @@ "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-ecr-pullthroughcacherule.json", @@ -1037,7 +1034,6 @@ "aws-events-eventbuspolicy.json", "aws-events-rule.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", "aws-fsx-snapshot.json", @@ -1125,7 +1121,9 @@ "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", "aws-logs-transformer.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", @@ -1223,6 +1221,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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/il_central_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/il_central_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/il_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/il_central_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/il_central_1/aws-m2-application.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/il_central_1/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} diff --git a/src/cfnlint/data/schemas/providers/me_central_1/__init__.py b/src/cfnlint/data/schemas/providers/me_central_1/__init__.py index f94d6479b3..4b1afd1c96 100644 --- a/src/cfnlint/data/schemas/providers/me_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/me_central_1/__init__.py @@ -755,6 +755,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", @@ -1020,7 +1021,6 @@ "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-ecr-pullthroughcacherule.json", @@ -1083,7 +1083,6 @@ "aws-eventschemas-registrypolicy.json", "aws-eventschemas-schema.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-snapshot.json", diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/me_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/me_central_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/me_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/me_central_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/me_south_1/__init__.py b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py index f8cf86ba59..cc3504b91f 100644 --- a/src/cfnlint/data/schemas/providers/me_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py @@ -838,6 +838,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", @@ -1061,7 +1062,6 @@ "aws-dms-replicationtask.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnendpoint.json", "aws-ec2-clientvpnroute.json", @@ -1146,7 +1146,6 @@ "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", @@ -1216,7 +1215,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1369,6 +1367,7 @@ "aws-neptune-dbparametergroup.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", @@ -1437,7 +1436,6 @@ "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", @@ -1456,6 +1454,7 @@ "aws-route53-recordsetgroup.json", "aws-route53profiles-profile.json", "aws-route53profiles-profileassociation.json", + "aws-route53profiles-profileresourceassociation.json", "aws-route53resolver-firewalldomainlist.json", "aws-route53resolver-firewallrulegroup.json", "aws-route53resolver-firewallrulegroupassociation.json", diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/me_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/me_south_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/me_south_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/me_south_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/me_south_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/me_south_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/me_south_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-resiliencehub-app.json new file mode 100644 index 0000000000..40b055a88b --- /dev/null +++ b/src/cfnlint/data/schemas/providers/me_south_1/aws-resiliencehub-app.json @@ -0,0 +1,222 @@ +{ + "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/me_south_1/aws-route53profiles-profileresourceassociation.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-route53profiles-profileresourceassociation.json deleted file mode 100644 index 3ae0e45d93..0000000000 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-route53profiles-profileresourceassociation.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ProfileId", - "/properties/Name", - "/properties/ResourceArn" - ], - "primaryIdentifier": [ - "/properties/Id" - ], - "properties": { - "Id": { - "type": "string" - }, - "Name": { - "type": "string" - }, - "ProfileId": { - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "ResourceProperties": { - "type": "string" - }, - "ResourceType": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Id", - "/properties/ResourceType" - ], - "replacementStrategy": "delete_then_create", - "required": [ - "ProfileId", - "Name", - "ResourceArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-route53profiles", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Route53Profiles::ProfileResourceAssociation" -} 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 a1a20e2879..7d0976e6c0 100644 --- a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py @@ -764,6 +764,7 @@ "AWS::QuickSight::RefreshSchedule", "AWS::QuickSight::Template", "AWS::QuickSight::Theme", + "AWS::QuickSight::Topic", "AWS::QuickSight::VPCConnection", "AWS::RAM::Permission", "AWS::RAM::ResourceShare", @@ -1226,6 +1227,7 @@ "aws-cloudwatch-dashboard.json", "aws-cloudwatch-insightrule.json", "aws-cloudwatch-metricstream.json", + "aws-codebuild-fleet.json", "aws-codebuild-project.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", @@ -1774,6 +1776,7 @@ "aws-quicksight-refreshschedule.json", "aws-quicksight-template.json", "aws-quicksight-theme.json", + "aws-quicksight-topic.json", "aws-quicksight-vpcconnection.json", "aws-ram-permission.json", "aws-ram-resourceshare.json", diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-codebuild-fleet.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-codebuild-fleet.json deleted file mode 100644 index 05ad47e89e..0000000000 --- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-codebuild-fleet.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "ComputeConfiguration": { - "additionalProperties": false, - "properties": { - "disk": { - "type": "integer" - }, - "machineType": { - "enum": [ - "GENERAL", - "NVME" - ], - "type": "string" - }, - "memory": { - "type": "integer" - }, - "vCpu": { - "type": "integer" - } - }, - "type": "object" - }, - "FleetProxyRule": { - "additionalProperties": false, - "properties": { - "Effect": { - "enum": [ - "ALLOW", - "DENY" - ], - "type": "string" - }, - "Entities": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "type": "array" - }, - "Type": { - "enum": [ - "DOMAIN", - "IP" - ], - "type": "string" - } - }, - "type": "object" - }, - "ProxyConfiguration": { - "additionalProperties": false, - "properties": { - "DefaultBehavior": { - "enum": [ - "ALLOW_ALL", - "DENY_ALL" - ], - "type": "string" - }, - "OrderedProxyRules": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/FleetProxyRule" - }, - "type": "array" - } - }, - "type": "object" - }, - "ScalingConfigurationInput": { - "additionalProperties": false, - "properties": { - "MaxCapacity": { - "minimum": 1, - "type": "integer" - }, - "ScalingType": { - "enum": [ - "TARGET_TRACKING_SCALING" - ], - "type": "string" - }, - "TargetTrackingScalingConfigs": { - "items": { - "$ref": "#/definitions/TargetTrackingScalingConfiguration" - }, - "type": "array" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(?!aws:)[a-zA-Z+-=._:/]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "pattern": "[a-zA-Z+-=._:/]+$", - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "TargetTrackingScalingConfiguration": { - "additionalProperties": false, - "properties": { - "MetricType": { - "enum": [ - "FLEET_UTILIZATION_RATE" - ], - "type": "string" - }, - "TargetValue": { - "type": "number" - } - }, - "type": "object" - }, - "VpcConfig": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "type": "array" - }, - "Subnets": { - "format": "AWS::EC2::Subnet.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - }, - "type": "array" - }, - "VpcId": { - "format": "AWS::EC2::VPC.Id", - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "minLength": 1, - "type": "string" - }, - "BaseCapacity": { - "minimum": 1, - "type": "integer" - }, - "ComputeConfiguration": { - "$ref": "#/definitions/ComputeConfiguration" - }, - "ComputeType": { - "enum": [ - "BUILD_GENERAL1_SMALL", - "BUILD_GENERAL1_MEDIUM", - "BUILD_GENERAL1_LARGE", - "BUILD_GENERAL1_XLARGE", - "BUILD_GENERAL1_2XLARGE", - "ATTRIBUTE_BASED_COMPUTE" - ], - "type": "string" - }, - "EnvironmentType": { - "enum": [ - "WINDOWS_SERVER_2019_CONTAINER", - "WINDOWS_SERVER_2022_CONTAINER", - "LINUX_CONTAINER", - "LINUX_GPU_CONTAINER", - "ARM_CONTAINER", - "MAC_ARM" - ], - "type": "string" - }, - "FleetProxyConfiguration": { - "$ref": "#/definitions/ProxyConfiguration" - }, - "FleetServiceRole": { - "pattern": "^(?:arn:)[a-zA-Z+-=,._:/@]+$", - "type": "string" - }, - "FleetVpcConfig": { - "$ref": "#/definitions/VpcConfig" - }, - "ImageId": { - "format": "AWS::EC2::Image.Id", - "pattern": "^((aws/codebuild/[A-Za-z-]+:[0-9]+(-[0-9._]+)?)|ami-[a-z0-9]{1,1020})$", - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 2, - "pattern": "[A-Za-z0-9][A-Za-z0-9\\-_]{1,127}", - "type": "string" - }, - "OverflowBehavior": { - "enum": [ - "QUEUE", - "ON_DEMAND" - ], - "type": "string" - }, - "ScalingConfiguration": { - "$ref": "#/definitions/ScalingConfigurationInput" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CodeBuild::Fleet" -} diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json index 633dc82458..3c1b0b7bb6 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-autoscaling-launchconfiguration.json @@ -173,24 +173,24 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", + "anyOf": [ + { + "format": "AWS::EC2::SecurityGroup.Id" + }, + { + "format": "AWS::EC2::SecurityGroup.Name" + } + ], "insertionOrder": false, "items": { "anyOf": [ { - "relationshipRef": { - "propertyPath": "/properties/GroupId", - "typeName": "AWS::EC2::SecurityGroup" - } + "format": "AWS::EC2::SecurityGroup.Id" }, { - "relationshipRef": { - "propertyPath": "/properties/Id", - "typeName": "AWS::EC2::SecurityGroup" - } + "format": "AWS::EC2::SecurityGroup.Name" } ], - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-bedrock-knowledgebase.json index 75bbdf1578..25c80e5f17 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-bedrock-knowledgebase.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-bedrock-knowledgebase.json @@ -32,6 +32,13 @@ "maximum": 4096, "minimum": 0, "type": "integer" + }, + "EmbeddingDataType": { + "enum": [ + "FLOAT32", + "BINARY" + ], + "type": "string" } }, "type": "object" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudwatch-metricstream.json index 89ca2654d5..2d8b6042f2 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudwatch-metricstream.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudwatch-metricstream.json @@ -220,9 +220,12 @@ "/properties/State" ], "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git", - "taggable": true, - "typeName": "AWS::CloudWatch::MetricStream", - "writeOnlyProperties": [ - "/properties/Tags" - ] + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::CloudWatch::MetricStream" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-capacityreservation.json index 5a10969ce5..a4a5771479 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-capacityreservation.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-capacityreservation.json @@ -9,7 +9,8 @@ "/properties/OutPostArn", "/properties/EphemeralStorage", "/properties/EbsOptimized", - "/properties/PlacementGroupArn" + "/properties/PlacementGroupArn", + "/properties/AvailabilityZoneId" ], "definitions": { "Tag": { @@ -144,6 +145,9 @@ "AvailabilityZone": { "type": "string" }, + "AvailabilityZoneId": { + "type": "string" + }, "AvailableInstanceCount": { "type": "integer" }, @@ -239,10 +243,16 @@ ], "required": [ "InstanceCount", - "AvailabilityZone", "InstancePlatform", "InstanceType" ], + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/TagSpecifications", + "tagUpdatable": true, + "taggable": true + }, "typeName": "AWS::EC2::CapacityReservation", "writeOnlyProperties": [ "/properties/UnusedReservationBillingOwnerId" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpnconnection.json index 5f9a8ac704..28b2c8b013 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpnconnection.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-vpnconnection.json @@ -369,6 +369,7 @@ "readOnlyProperties": [ "/properties/VpnConnectionId" ], + "replacementStrategy": "delete_then_create", "required": [ "Type", "CustomerGatewayId" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticache-securitygroupingress.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticache-securitygroupingress.json index bbb7889637..6ae333d0f2 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticache-securitygroupingress.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-elasticache-securitygroupingress.json @@ -5,9 +5,11 @@ ], "properties": { "CacheSecurityGroupName": { + "format": "AWS::EC2::SecurityGroup.Name", "type": "string" }, "EC2SecurityGroupName": { + "format": "AWS::EC2::SecurityGroup.Name", "type": "string" }, "EC2SecurityGroupOwnerId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-fms-policy.json index 8422693828..3d4f573a4c 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-fms-policy.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-fms-policy.json @@ -366,6 +366,13 @@ "type": "array", "uniqueItems": true }, + "ResourceTagLogicalOperator": { + "enum": [ + "AND", + "OR" + ], + "type": "string" + }, "ResourceTags": { "insertionOrder": true, "items": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json index 107cc06e52..113156efe8 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-mediaconnect-flow.json @@ -6,6 +6,31 @@ "/properties/Source/Name" ], "definitions": { + "AudioMonitoringSetting": { + "additionalProperties": false, + "properties": { + "SilentAudio": { + "$ref": "#/definitions/SilentAudio" + } + }, + "type": "object" + }, + "BlackFrames": { + "additionalProperties": false, + "properties": { + "State": { + "enum": [ + "ENABLED", + "DISABLED" + ], + "type": "string" + }, + "ThresholdSeconds": { + "type": "integer" + } + }, + "type": "object" + }, "Encryption": { "additionalProperties": false, "properties": { @@ -145,6 +170,22 @@ }, "type": "object" }, + "FrozenFrames": { + "additionalProperties": false, + "properties": { + "State": { + "enum": [ + "ENABLED", + "DISABLED" + ], + "type": "string" + }, + "ThresholdSeconds": { + "type": "integer" + } + }, + "type": "object" + }, "GatewayBridgeSource": { "additionalProperties": false, "properties": { @@ -300,6 +341,22 @@ ], "type": "object" }, + "SilentAudio": { + "additionalProperties": false, + "properties": { + "State": { + "enum": [ + "ENABLED", + "DISABLED" + ], + "type": "string" + }, + "ThresholdSeconds": { + "type": "integer" + } + }, + "type": "object" + }, "Source": { "additionalProperties": false, "properties": { @@ -389,17 +446,45 @@ "SourceMonitoringConfig": { "additionalProperties": false, "properties": { + "AudioMonitoringSettings": { + "items": { + "$ref": "#/definitions/AudioMonitoringSetting" + }, + "type": "array" + }, + "ContentQualityAnalysisState": { + "enum": [ + "ENABLED", + "DISABLED" + ], + "type": "string" + }, "ThumbnailState": { "enum": [ "ENABLED", "DISABLED" ], "type": "string" + }, + "VideoMonitoringSettings": { + "items": { + "$ref": "#/definitions/VideoMonitoringSetting" + }, + "type": "array" + } + }, + "type": "object" + }, + "VideoMonitoringSetting": { + "additionalProperties": false, + "properties": { + "BlackFrames": { + "$ref": "#/definitions/BlackFrames" + }, + "FrozenFrames": { + "$ref": "#/definitions/FrozenFrames" } }, - "required": [ - "ThumbnailState" - ], "type": "object" }, "VpcInterface": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-pcs-cluster.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-pcs-cluster.json index f8507115e2..0eb3ff4219 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-pcs-cluster.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-pcs-cluster.json @@ -134,7 +134,6 @@ "type": "string" }, "Name": { - "pattern": "^(?!pcs_)^(?![A-Za-z0-9]{10}$)[A-Za-z][A-Za-z0-9-]+$", "type": "string" }, "Networking": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-webexperience.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-webexperience.json index 89b38650d7..be863d400b 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-webexperience.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-qbusiness-webexperience.json @@ -4,6 +4,32 @@ "/properties/ApplicationId" ], "definitions": { + "BrowserExtension": { + "enum": [ + "FIREFOX", + "CHROME" + ], + "type": "string" + }, + "BrowserExtensionConfiguration": { + "additionalProperties": false, + "properties": { + "EnabledBrowserExtensions": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/BrowserExtension" + }, + "maxItems": 2, + "minItems": 0, + "type": "array", + "uniqueItems": true + } + }, + "required": [ + "EnabledBrowserExtensions" + ], + "type": "object" + }, "CustomizationConfiguration": { "additionalProperties": false, "properties": { @@ -156,6 +182,9 @@ "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$", "type": "string" }, + "BrowserExtensionConfiguration": { + "$ref": "#/definitions/BrowserExtensionConfiguration" + }, "CreatedAt": { "format": "date-time", "type": "string" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroup.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroup.json index c73cd68421..21c3fad66f 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroup.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroup.json @@ -12,9 +12,11 @@ "type": "string" }, "EC2SecurityGroupId": { + "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "EC2SecurityGroupName": { + "format": "AWS::EC2::SecurityGroup.Name", "type": "string" }, "EC2SecurityGroupOwnerId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroupingress.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroupingress.json index a351124518..611a247bc0 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroupingress.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-rds-dbsecuritygroupingress.json @@ -11,9 +11,11 @@ "type": "string" }, "EC2SecurityGroupId": { + "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "EC2SecurityGroupName": { + "format": "AWS::EC2::SecurityGroup.Name", "type": "string" }, "EC2SecurityGroupOwnerId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-clustersecuritygroupingress.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-clustersecuritygroupingress.json index a977c04244..39ab6916d6 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-clustersecuritygroupingress.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-redshift-clustersecuritygroupingress.json @@ -14,9 +14,11 @@ "type": "string" }, "ClusterSecurityGroupName": { + "format": "AWS::EC2::SecurityGroup.Name", "type": "string" }, "EC2SecurityGroupName": { + "format": "AWS::EC2::SecurityGroup.Name", "type": "string" }, "EC2SecurityGroupOwnerId": { diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-resiliencehub-app.json index 40b055a88b..51face9e24 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-resiliencehub-app.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-resiliencehub-app.json @@ -181,10 +181,6 @@ "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" diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ssmincidents-replicationset.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ssmincidents-replicationset.json index f2d65585be..aeda64f3be 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ssmincidents-replicationset.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ssmincidents-replicationset.json @@ -13,7 +13,8 @@ "additionalProperties": false, "properties": { "SseKmsKeyId": { - "$ref": "#/definitions/Arn" + "maxLength": 2048, + "type": "string" } }, "required": [ diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-database.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-database.json index 1b75d0d484..f265e604f9 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-database.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-database.json @@ -50,5 +50,12 @@ "/properties/Arn" ], "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::Database" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-influxdbinstance.json index 0ca36fcc35..20c12c35d2 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-influxdbinstance.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-influxdbinstance.json @@ -6,13 +6,12 @@ "/properties/Password", "/properties/Organization", "/properties/Bucket", - "/properties/DbInstanceType", "/properties/VpcSubnetIds", "/properties/VpcSecurityGroupIds", "/properties/PubliclyAccessible", "/properties/DbStorageType", "/properties/AllocatedStorage", - "/properties/DeploymentType" + "/properties/NetworkType" ], "definitions": { "Tag": { @@ -137,7 +136,14 @@ "Name": { "maxLength": 40, "minLength": 3, - "pattern": "^[a-zA-z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", + "pattern": "^[a-zA-Z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$", + "type": "string" + }, + "NetworkType": { + "enum": [ + "IPV4", + "DUAL" + ], "type": "string" }, "Organization": { @@ -151,6 +157,11 @@ "pattern": "^[a-zA-Z0-9]+$", "type": "string" }, + "Port": { + "maximum": 65535, + "minimum": 1024, + "type": "integer" + }, "PubliclyAccessible": { "default": false, "type": "boolean" @@ -165,6 +176,8 @@ "DELETING", "MODIFYING", "UPDATING", + "UPDATING_DEPLOYMENT_TYPE", + "UPDATING_INSTANCE_TYPE", "DELETED", "FAILED" ], diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-scheduledquery.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-scheduledquery.json index 167de59178..3520e12bbb 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-scheduledquery.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-scheduledquery.json @@ -455,5 +455,12 @@ "ErrorReportConfiguration" ], "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::ScheduledQuery" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-table.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-table.json index bc876a009a..d5e6d3f7bf 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-table.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-timestream-table.json @@ -164,5 +164,12 @@ "DatabaseName" ], "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::Table" } 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 a81149ade0..4f167fc586 100644 --- a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py @@ -1201,6 +1201,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", @@ -1342,6 +1343,7 @@ "aws-bedrock-guardrailversion.json", "aws-bedrock-knowledgebase.json", "aws-bedrock-prompt.json", + "aws-bedrock-promptversion.json", "aws-budgets-budget.json", "aws-budgets-budgetsaction.json", "aws-cassandra-keyspace.json", @@ -1412,6 +1414,7 @@ "aws-codeartifact-domain.json", "aws-codeartifact-packagegroup.json", "aws-codeartifact-repository.json", + "aws-codebuild-fleet.json", "aws-codebuild-project.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", @@ -1621,7 +1624,6 @@ "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", @@ -1705,7 +1707,6 @@ "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", @@ -1936,7 +1937,9 @@ "aws-lookoutmetrics-alert.json", "aws-lookoutmetrics-anomalydetector.json", "aws-lookoutvision-project.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-macie-allowlist.json", "aws-macie-customdataidentifier.json", "aws-macie-findingsfilter.json", @@ -2079,6 +2082,7 @@ "aws-quicksight-refreshschedule.json", "aws-quicksight-template.json", "aws-quicksight-theme.json", + "aws-quicksight-topic.json", "aws-quicksight-vpcconnection.json", "aws-ram-permission.json", "aws-ram-resourceshare.json", @@ -2093,6 +2097,7 @@ "aws-rds-dbproxytargetgroup.json", "aws-rds-dbsecuritygroup.json", "aws-rds-dbsecuritygroupingress.json", + "aws-rds-dbshardgroup.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", "aws-rds-globalcluster.json", diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/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_2/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-bedrock-promptversion.json deleted file mode 100644 index b79f1da1a7..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-bedrock-promptversion.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/PromptArn", - "/properties/Description", - "/properties/Tags" - ], - "definitions": { - "PromptInferenceConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/PromptModelInferenceConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptInputVariable": { - "additionalProperties": false, - "properties": { - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - } - }, - "type": "object" - }, - "PromptModelInferenceConfiguration": { - "additionalProperties": false, - "properties": { - "MaxTokens": { - "maximum": 4096, - "minimum": 0, - "type": "number" - }, - "StopSequences": { - "insertionOrder": true, - "items": { - "type": "string" - }, - "maxItems": 4, - "minItems": 0, - "type": "array" - }, - "Temperature": { - "maximum": 1, - "minimum": 0, - "type": "number" - }, - "TopP": { - "maximum": 1, - "minimum": 0, - "type": "number" - } - }, - "type": "object" - }, - "PromptTemplateConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/TextPromptTemplateConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptTemplateType": { - "enum": [ - "TEXT" - ], - "type": "string" - }, - "PromptVariant": { - "additionalProperties": false, - "properties": { - "InferenceConfiguration": { - "$ref": "#/definitions/PromptInferenceConfiguration" - }, - "ModelId": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$", - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "TemplateConfiguration": { - "$ref": "#/definitions/PromptTemplateConfiguration" - }, - "TemplateType": { - "$ref": "#/definitions/PromptTemplateType" - } - }, - "required": [ - "Name", - "TemplateType", - "TemplateConfiguration" - ], - "type": "object" - }, - "TagsMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z0-9\\s._:/=+@-]*$": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$", - "type": "string" - } - }, - "type": "object" - }, - "TextPromptTemplateConfiguration": { - "additionalProperties": false, - "properties": { - "InputVariables": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptInputVariable" - }, - "maxItems": 5, - "minItems": 0, - "type": "array" - }, - "Text": { - "maxLength": 200000, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Text" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}:[0-9]{1,20})$", - "type": "string" - }, - "CreatedAt": { - "format": "date-time", - "type": "string" - }, - "CustomerEncryptionKeyArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$", - "type": "string" - }, - "DefaultVariant": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "Description": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "PromptArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10})$", - "type": "string" - }, - "PromptId": { - "pattern": "^[0-9a-zA-Z]{10}$", - "type": "string" - }, - "Tags": { - "$ref": "#/definitions/TagsMap" - }, - "UpdatedAt": { - "format": "date-time", - "type": "string" - }, - "Variants": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptVariant" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "Version": { - "maxLength": 5, - "minLength": 1, - "pattern": "^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreatedAt", - "/properties/PromptId", - "/properties/UpdatedAt", - "/properties/Version", - "/properties/Name", - "/properties/DefaultVariant", - "/properties/Variants", - "/properties/CustomerEncryptionKeyArn" - ], - "required": [ - "PromptArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-prompts", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": false, - "taggable": true - }, - "typeName": "AWS::Bedrock::PromptVersion" -} diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-codebuild-fleet.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-codebuild-fleet.json deleted file mode 100644 index 05ad47e89e..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-codebuild-fleet.json +++ /dev/null @@ -1,248 +0,0 @@ -{ - "additionalProperties": false, - "definitions": { - "ComputeConfiguration": { - "additionalProperties": false, - "properties": { - "disk": { - "type": "integer" - }, - "machineType": { - "enum": [ - "GENERAL", - "NVME" - ], - "type": "string" - }, - "memory": { - "type": "integer" - }, - "vCpu": { - "type": "integer" - } - }, - "type": "object" - }, - "FleetProxyRule": { - "additionalProperties": false, - "properties": { - "Effect": { - "enum": [ - "ALLOW", - "DENY" - ], - "type": "string" - }, - "Entities": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "type": "array" - }, - "Type": { - "enum": [ - "DOMAIN", - "IP" - ], - "type": "string" - } - }, - "type": "object" - }, - "ProxyConfiguration": { - "additionalProperties": false, - "properties": { - "DefaultBehavior": { - "enum": [ - "ALLOW_ALL", - "DENY_ALL" - ], - "type": "string" - }, - "OrderedProxyRules": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/FleetProxyRule" - }, - "type": "array" - } - }, - "type": "object" - }, - "ScalingConfigurationInput": { - "additionalProperties": false, - "properties": { - "MaxCapacity": { - "minimum": 1, - "type": "integer" - }, - "ScalingType": { - "enum": [ - "TARGET_TRACKING_SCALING" - ], - "type": "string" - }, - "TargetTrackingScalingConfigs": { - "items": { - "$ref": "#/definitions/TargetTrackingScalingConfiguration" - }, - "type": "array" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(?!aws:)[a-zA-Z+-=._:/]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "pattern": "[a-zA-Z+-=._:/]+$", - "type": "string" - } - }, - "required": [ - "Value", - "Key" - ], - "type": "object" - }, - "TargetTrackingScalingConfiguration": { - "additionalProperties": false, - "properties": { - "MetricType": { - "enum": [ - "FLEET_UTILIZATION_RATE" - ], - "type": "string" - }, - "TargetValue": { - "type": "number" - } - }, - "type": "object" - }, - "VpcConfig": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "type": "string" - }, - "type": "array" - }, - "Subnets": { - "format": "AWS::EC2::Subnet.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - }, - "type": "array" - }, - "VpcId": { - "format": "AWS::EC2::VPC.Id", - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "minLength": 1, - "type": "string" - }, - "BaseCapacity": { - "minimum": 1, - "type": "integer" - }, - "ComputeConfiguration": { - "$ref": "#/definitions/ComputeConfiguration" - }, - "ComputeType": { - "enum": [ - "BUILD_GENERAL1_SMALL", - "BUILD_GENERAL1_MEDIUM", - "BUILD_GENERAL1_LARGE", - "BUILD_GENERAL1_XLARGE", - "BUILD_GENERAL1_2XLARGE", - "ATTRIBUTE_BASED_COMPUTE" - ], - "type": "string" - }, - "EnvironmentType": { - "enum": [ - "WINDOWS_SERVER_2019_CONTAINER", - "WINDOWS_SERVER_2022_CONTAINER", - "LINUX_CONTAINER", - "LINUX_GPU_CONTAINER", - "ARM_CONTAINER", - "MAC_ARM" - ], - "type": "string" - }, - "FleetProxyConfiguration": { - "$ref": "#/definitions/ProxyConfiguration" - }, - "FleetServiceRole": { - "pattern": "^(?:arn:)[a-zA-Z+-=,._:/@]+$", - "type": "string" - }, - "FleetVpcConfig": { - "$ref": "#/definitions/VpcConfig" - }, - "ImageId": { - "format": "AWS::EC2::Image.Id", - "pattern": "^((aws/codebuild/[A-Za-z-]+:[0-9]+(-[0-9._]+)?)|ami-[a-z0-9]{1,1020})$", - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 2, - "pattern": "[A-Za-z0-9][A-Za-z0-9\\-_]{1,127}", - "type": "string" - }, - "OverflowBehavior": { - "enum": [ - "QUEUE", - "ON_DEMAND" - ], - "type": "string" - }, - "ScalingConfiguration": { - "$ref": "#/definitions/ScalingConfigurationInput" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::CodeBuild::Fleet" -} diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/us_east_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_east_2/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/us_east_2/aws-m2-application.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-quicksight-topic.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-quicksight-topic.json deleted file mode 100644 index dee72eae6a..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-quicksight-topic.json +++ /dev/null @@ -1,990 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/AwsAccountId", - "/properties/TopicId" - ], - "definitions": { - "AggregationFunctionParameters": { - "additionalProperties": false, - "patternProperties": { - ".+": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "AuthorSpecifiedAggregation": { - "enum": [ - "COUNT", - "DISTINCT_COUNT", - "MIN", - "MAX", - "MEDIAN", - "SUM", - "AVERAGE", - "STDEV", - "STDEVP", - "VAR", - "VARP", - "PERCENTILE" - ], - "type": "string" - }, - "CategoryFilterFunction": { - "enum": [ - "EXACT", - "CONTAINS" - ], - "type": "string" - }, - "CategoryFilterType": { - "enum": [ - "CUSTOM_FILTER", - "CUSTOM_FILTER_LIST", - "FILTER_LIST" - ], - "type": "string" - }, - "CellValueSynonym": { - "additionalProperties": false, - "properties": { - "CellValue": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Synonyms": { - "items": { - "type": "string" - }, - "type": "array" - } - }, - "type": "object" - }, - "CollectiveConstant": { - "additionalProperties": false, - "properties": { - "ValueList": { - "items": { - "type": "string" - }, - "type": "array" - } - }, - "type": "object" - }, - "ColumnDataRole": { - "enum": [ - "DIMENSION", - "MEASURE" - ], - "type": "string" - }, - "ColumnOrderingType": { - "enum": [ - "GREATER_IS_BETTER", - "LESSER_IS_BETTER", - "SPECIFIED" - ], - "type": "string" - }, - "ComparativeOrder": { - "additionalProperties": false, - "properties": { - "SpecifedOrder": { - "items": { - "type": "string" - }, - "type": "array" - }, - "TreatUndefinedSpecifiedValues": { - "$ref": "#/definitions/UndefinedSpecifiedValueType" - }, - "UseOrdering": { - "$ref": "#/definitions/ColumnOrderingType" - } - }, - "type": "object" - }, - "ConstantType": { - "enum": [ - "SINGULAR", - "RANGE", - "COLLECTIVE" - ], - "type": "string" - }, - "DataAggregation": { - "additionalProperties": false, - "properties": { - "DatasetRowDateGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - }, - "DefaultDateColumnName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "DatasetMetadata": { - "additionalProperties": false, - "properties": { - "CalculatedFields": { - "items": { - "$ref": "#/definitions/TopicCalculatedField" - }, - "type": "array" - }, - "Columns": { - "items": { - "$ref": "#/definitions/TopicColumn" - }, - "type": "array" - }, - "DataAggregation": { - "$ref": "#/definitions/DataAggregation" - }, - "DatasetArn": { - "type": "string" - }, - "DatasetDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "DatasetName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Filters": { - "items": { - "$ref": "#/definitions/TopicFilter" - }, - "type": "array" - }, - "NamedEntities": { - "items": { - "$ref": "#/definitions/TopicNamedEntity" - }, - "type": "array" - } - }, - "required": [ - "DatasetArn" - ], - "type": "object" - }, - "DefaultAggregation": { - "enum": [ - "SUM", - "MAX", - "MIN", - "COUNT", - "DISTINCT_COUNT", - "AVERAGE", - "MEDIAN", - "STDEV", - "STDEVP", - "VAR", - "VARP" - ], - "type": "string" - }, - "DefaultFormatting": { - "additionalProperties": false, - "properties": { - "DisplayFormat": { - "$ref": "#/definitions/DisplayFormat" - }, - "DisplayFormatOptions": { - "$ref": "#/definitions/DisplayFormatOptions" - } - }, - "type": "object" - }, - "DisplayFormat": { - "enum": [ - "AUTO", - "PERCENT", - "CURRENCY", - "NUMBER", - "DATE", - "STRING" - ], - "type": "string" - }, - "DisplayFormatOptions": { - "additionalProperties": false, - "properties": { - "BlankCellFormat": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "CurrencySymbol": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "DateFormat": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "DecimalSeparator": { - "$ref": "#/definitions/TopicNumericSeparatorSymbol" - }, - "FractionDigits": { - "default": 0, - "type": "number" - }, - "GroupingSeparator": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "NegativeFormat": { - "$ref": "#/definitions/NegativeFormat" - }, - "Prefix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Suffix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "UnitScaler": { - "$ref": "#/definitions/NumberScale" - }, - "UseBlankCellFormat": { - "default": false, - "type": "boolean" - }, - "UseGrouping": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "FilterClass": { - "enum": [ - "ENFORCED_VALUE_FILTER", - "CONDITIONAL_VALUE_FILTER", - "NAMED_VALUE_FILTER" - ], - "type": "string" - }, - "NamedEntityAggType": { - "enum": [ - "SUM", - "MIN", - "MAX", - "COUNT", - "AVERAGE", - "DISTINCT_COUNT", - "STDEV", - "STDEVP", - "VAR", - "VARP", - "PERCENTILE", - "MEDIAN", - "CUSTOM" - ], - "type": "string" - }, - "NamedEntityDefinition": { - "additionalProperties": false, - "properties": { - "FieldName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Metric": { - "$ref": "#/definitions/NamedEntityDefinitionMetric" - }, - "PropertyName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "PropertyRole": { - "$ref": "#/definitions/PropertyRole" - }, - "PropertyUsage": { - "$ref": "#/definitions/PropertyUsage" - } - }, - "type": "object" - }, - "NamedEntityDefinitionMetric": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/NamedEntityAggType" - }, - "AggregationFunctionParameters": { - "$ref": "#/definitions/AggregationFunctionParameters" - } - }, - "type": "object" - }, - "NamedFilterAggType": { - "enum": [ - "NO_AGGREGATION", - "SUM", - "AVERAGE", - "COUNT", - "DISTINCT_COUNT", - "MAX", - "MEDIAN", - "MIN", - "STDEV", - "STDEVP", - "VAR", - "VARP" - ], - "type": "string" - }, - "NamedFilterType": { - "enum": [ - "CATEGORY_FILTER", - "NUMERIC_EQUALITY_FILTER", - "NUMERIC_RANGE_FILTER", - "DATE_RANGE_FILTER", - "RELATIVE_DATE_FILTER" - ], - "type": "string" - }, - "NegativeFormat": { - "additionalProperties": false, - "properties": { - "Prefix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Suffix": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "NumberScale": { - "enum": [ - "NONE", - "AUTO", - "THOUSANDS", - "MILLIONS", - "BILLIONS", - "TRILLIONS" - ], - "type": "string" - }, - "PropertyRole": { - "enum": [ - "PRIMARY", - "ID" - ], - "type": "string" - }, - "PropertyUsage": { - "enum": [ - "INHERIT", - "DIMENSION", - "MEASURE" - ], - "type": "string" - }, - "RangeConstant": { - "additionalProperties": false, - "properties": { - "Maximum": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Minimum": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "SemanticEntityType": { - "additionalProperties": false, - "properties": { - "SubTypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TypeParameters": { - "$ref": "#/definitions/TypeParameters" - } - }, - "type": "object" - }, - "SemanticType": { - "additionalProperties": false, - "properties": { - "FalseyCellValue": { - "type": "string" - }, - "FalseyCellValueSynonyms": { - "items": { - "type": "string" - }, - "type": "array" - }, - "SubTypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TruthyCellValue": { - "type": "string" - }, - "TruthyCellValueSynonyms": { - "items": { - "type": "string" - }, - "type": "array" - }, - "TypeName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "TypeParameters": { - "$ref": "#/definitions/TypeParameters" - } - }, - "type": "object" - }, - "TopicCalculatedField": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/DefaultAggregation" - }, - "AllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "CalculatedFieldDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "CalculatedFieldName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "CalculatedFieldSynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "CellValueSynonyms": { - "items": { - "$ref": "#/definitions/CellValueSynonym" - }, - "type": "array" - }, - "ColumnDataRole": { - "$ref": "#/definitions/ColumnDataRole" - }, - "ComparativeOrder": { - "$ref": "#/definitions/ComparativeOrder" - }, - "DefaultFormatting": { - "$ref": "#/definitions/DefaultFormatting" - }, - "DisableIndexing": { - "type": "boolean" - }, - "Expression": { - "maxLength": 4096, - "minLength": 1, - "type": "string" - }, - "IsIncludedInTopic": { - "default": false, - "type": "boolean" - }, - "NeverAggregateInFilter": { - "default": false, - "type": "boolean" - }, - "NonAdditive": { - "default": false, - "type": "boolean" - }, - "NotAllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "SemanticType": { - "$ref": "#/definitions/SemanticType" - }, - "TimeGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - } - }, - "required": [ - "CalculatedFieldName", - "Expression" - ], - "type": "object" - }, - "TopicCategoryFilter": { - "additionalProperties": false, - "properties": { - "CategoryFilterFunction": { - "$ref": "#/definitions/CategoryFilterFunction" - }, - "CategoryFilterType": { - "$ref": "#/definitions/CategoryFilterType" - }, - "Constant": { - "$ref": "#/definitions/TopicCategoryFilterConstant" - }, - "Inverse": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "TopicCategoryFilterConstant": { - "additionalProperties": false, - "properties": { - "CollectiveConstant": { - "$ref": "#/definitions/CollectiveConstant" - }, - "ConstantType": { - "$ref": "#/definitions/ConstantType" - }, - "SingularConstant": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "TopicColumn": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/DefaultAggregation" - }, - "AllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "CellValueSynonyms": { - "items": { - "$ref": "#/definitions/CellValueSynonym" - }, - "type": "array" - }, - "ColumnDataRole": { - "$ref": "#/definitions/ColumnDataRole" - }, - "ColumnDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "ColumnFriendlyName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "ColumnName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "ColumnSynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "ComparativeOrder": { - "$ref": "#/definitions/ComparativeOrder" - }, - "DefaultFormatting": { - "$ref": "#/definitions/DefaultFormatting" - }, - "DisableIndexing": { - "type": "boolean" - }, - "IsIncludedInTopic": { - "default": false, - "type": "boolean" - }, - "NeverAggregateInFilter": { - "default": false, - "type": "boolean" - }, - "NonAdditive": { - "default": false, - "type": "boolean" - }, - "NotAllowedAggregations": { - "items": { - "$ref": "#/definitions/AuthorSpecifiedAggregation" - }, - "type": "array" - }, - "SemanticType": { - "$ref": "#/definitions/SemanticType" - }, - "TimeGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - } - }, - "required": [ - "ColumnName" - ], - "type": "object" - }, - "TopicDateRangeFilter": { - "additionalProperties": false, - "properties": { - "Constant": { - "$ref": "#/definitions/TopicRangeFilterConstant" - }, - "Inclusive": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "TopicDetails": { - "additionalProperties": false, - "properties": { - "DataSets": { - "items": { - "$ref": "#/definitions/DatasetMetadata" - }, - "type": "array" - }, - "Description": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "UserExperienceVersion": { - "$ref": "#/definitions/TopicUserExperienceVersion" - } - }, - "type": "object" - }, - "TopicFilter": { - "additionalProperties": false, - "properties": { - "CategoryFilter": { - "$ref": "#/definitions/TopicCategoryFilter" - }, - "DateRangeFilter": { - "$ref": "#/definitions/TopicDateRangeFilter" - }, - "FilterClass": { - "$ref": "#/definitions/FilterClass" - }, - "FilterDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "FilterName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "FilterSynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "FilterType": { - "$ref": "#/definitions/NamedFilterType" - }, - "NumericEqualityFilter": { - "$ref": "#/definitions/TopicNumericEqualityFilter" - }, - "NumericRangeFilter": { - "$ref": "#/definitions/TopicNumericRangeFilter" - }, - "OperandFieldName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "RelativeDateFilter": { - "$ref": "#/definitions/TopicRelativeDateFilter" - } - }, - "required": [ - "FilterName", - "OperandFieldName" - ], - "type": "object" - }, - "TopicNamedEntity": { - "additionalProperties": false, - "properties": { - "Definition": { - "items": { - "$ref": "#/definitions/NamedEntityDefinition" - }, - "type": "array" - }, - "EntityDescription": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "EntityName": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "EntitySynonyms": { - "items": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "SemanticEntityType": { - "$ref": "#/definitions/SemanticEntityType" - } - }, - "required": [ - "EntityName" - ], - "type": "object" - }, - "TopicNumericEqualityFilter": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/NamedFilterAggType" - }, - "Constant": { - "$ref": "#/definitions/TopicSingularFilterConstant" - } - }, - "type": "object" - }, - "TopicNumericRangeFilter": { - "additionalProperties": false, - "properties": { - "Aggregation": { - "$ref": "#/definitions/NamedFilterAggType" - }, - "Constant": { - "$ref": "#/definitions/TopicRangeFilterConstant" - }, - "Inclusive": { - "default": false, - "type": "boolean" - } - }, - "type": "object" - }, - "TopicNumericSeparatorSymbol": { - "enum": [ - "COMMA", - "DOT" - ], - "type": "string" - }, - "TopicRangeFilterConstant": { - "additionalProperties": false, - "properties": { - "ConstantType": { - "$ref": "#/definitions/ConstantType" - }, - "RangeConstant": { - "$ref": "#/definitions/RangeConstant" - } - }, - "type": "object" - }, - "TopicRelativeDateFilter": { - "additionalProperties": false, - "properties": { - "Constant": { - "$ref": "#/definitions/TopicSingularFilterConstant" - }, - "RelativeDateFilterFunction": { - "$ref": "#/definitions/TopicRelativeDateFilterFunction" - }, - "TimeGranularity": { - "$ref": "#/definitions/TopicTimeGranularity" - } - }, - "type": "object" - }, - "TopicRelativeDateFilterFunction": { - "enum": [ - "PREVIOUS", - "THIS", - "LAST", - "NEXT", - "NOW" - ], - "type": "string" - }, - "TopicSingularFilterConstant": { - "additionalProperties": false, - "properties": { - "ConstantType": { - "$ref": "#/definitions/ConstantType" - }, - "SingularConstant": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "TopicTimeGranularity": { - "enum": [ - "SECOND", - "MINUTE", - "HOUR", - "DAY", - "WEEK", - "MONTH", - "QUARTER", - "YEAR" - ], - "type": "string" - }, - "TopicUserExperienceVersion": { - "enum": [ - "LEGACY", - "NEW_READER_EXPERIENCE" - ], - "type": "string" - }, - "TypeParameters": { - "additionalProperties": false, - "patternProperties": { - ".+": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "UndefinedSpecifiedValueType": { - "enum": [ - "LEAST", - "MOST" - ], - "type": "string" - } - }, - "primaryIdentifier": [ - "/properties/AwsAccountId", - "/properties/TopicId" - ], - "properties": { - "Arn": { - "type": "string" - }, - "AwsAccountId": { - "maxLength": 12, - "minLength": 12, - "pattern": "^[0-9]{12}$", - "type": "string" - }, - "DataSets": { - "items": { - "$ref": "#/definitions/DatasetMetadata" - }, - "type": "array" - }, - "Description": { - "maxLength": 256, - "minLength": 0, - "type": "string" - }, - "Name": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "TopicId": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[A-Za-z0-9-_.\\\\+]*$", - "type": "string" - }, - "UserExperienceVersion": { - "$ref": "#/definitions/TopicUserExperienceVersion" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::QuickSight::Topic" -} diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-rds-dbshardgroup.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-rds-dbshardgroup.json deleted file mode 100644 index 691fa97c30..0000000000 --- a/src/cfnlint/data/schemas/providers/us_east_2/aws-rds-dbshardgroup.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DBClusterIdentifier", - "/properties/DBShardGroupIdentifier", - "/properties/PubliclyAccessible" - ], - "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/DBShardGroupIdentifier" - ], - "properties": { - "ComputeRedundancy": { - "minimum": 0, - "type": "integer" - }, - "DBClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupResourceId": { - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "MaxACU": { - "type": "number" - }, - "MinACU": { - "type": "number" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/DBClusterIdentifier": "$lowercase(DBClusterIdentifier)", - "/properties/DBShardGroupIdentifier": "$lowercase(DBShardGroupIdentifier)" - }, - "readOnlyProperties": [ - "/properties/DBShardGroupResourceId", - "/properties/Endpoint" - ], - "required": [ - "DBClusterIdentifier", - "MaxACU" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": false, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::RDS::DBShardGroup", - "writeOnlyProperties": [ - "/properties/MinACU" - ] -} 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 8c849507cb..735a36e37e 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 @@ -96,10 +96,14 @@ "AWS::Bedrock::Agent", "AWS::Bedrock::AgentAlias", "AWS::Bedrock::DataSource", + "AWS::Bedrock::Flow", + "AWS::Bedrock::FlowAlias", + "AWS::Bedrock::FlowVersion", "AWS::Bedrock::Guardrail", "AWS::Bedrock::GuardrailVersion", "AWS::Bedrock::KnowledgeBase", "AWS::Bedrock::Prompt", + "AWS::Bedrock::PromptVersion", "AWS::CDK::Metadata", "AWS::Cassandra::Keyspace", "AWS::Cassandra::Table", @@ -719,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", @@ -791,10 +796,13 @@ "aws-bedrock-agent.json", "aws-bedrock-agentalias.json", "aws-bedrock-datasource.json", + "aws-bedrock-flow.json", + "aws-bedrock-flowalias.json", + "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-cassandra-keyspace.json", "aws-cassandra-table.json", "aws-cassandra-type.json", @@ -821,7 +829,6 @@ "aws-cloudwatch-compositealarm.json", "aws-cloudwatch-dashboard.json", "aws-cloudwatch-insightrule.json", - "aws-cloudwatch-metricstream.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", "aws-codecommit-repository.json", @@ -872,7 +879,6 @@ "aws-docdb-eventsubscription.json", "aws-dynamodb-globaltable.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnendpoint.json", "aws-ec2-clientvpnroute.json", @@ -948,7 +954,6 @@ "aws-ec2-vpcendpointservice.json", "aws-ec2-vpcendpointservicepermissions.json", "aws-ec2-vpcpeeringconnection.json", - "aws-ec2-vpnconnection.json", "aws-ec2-vpnconnectionroute.json", "aws-ec2-vpngateway.json", "aws-ec2-vpngatewayroutepropagation.json", @@ -1112,7 +1117,9 @@ "aws-logs-querydefinition.json", "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-msk-batchscramsecret.json", "aws-msk-cluster.json", "aws-msk-clusterpolicy.json", @@ -1120,6 +1127,7 @@ "aws-msk-vpcconnection.json", "aws-neptune-dbcluster.json", "aws-neptune-dbsubnetgroup.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", @@ -1170,7 +1178,6 @@ "aws-redshift-eventsubscription.json", "aws-redshift-scheduledaction.json", "aws-redshiftserverless-namespace.json", - "aws-resiliencehub-app.json", "aws-resiliencehub-resiliencypolicy.json", "aws-resourcegroups-group.json", "aws-rolesanywhere-crl.json", diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_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_gov_east_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json new file mode 100644 index 0000000000..75bbdf1578 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json @@ -0,0 +1,974 @@ +{ + "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/us_gov_east_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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/us_gov_east_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/us_gov_east_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/us_gov_east_1/aws-m2-application.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_east_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/us_gov_east_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-resiliencehub-app.json new file mode 100644 index 0000000000..40b055a88b --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-resiliencehub-app.json @@ -0,0 +1,222 @@ +{ + "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/us_gov_west_1/__init__.py b/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py index 4c2afd9640..90a64944c9 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 @@ -842,6 +842,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", @@ -922,8 +923,8 @@ "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-cassandra-keyspace.json", "aws-cassandra-table.json", "aws-cassandra-type.json", @@ -950,7 +951,6 @@ "aws-cloudwatch-compositealarm.json", "aws-cloudwatch-dashboard.json", "aws-cloudwatch-insightrule.json", - "aws-cloudwatch-metricstream.json", "aws-codebuild-reportgroup.json", "aws-codebuild-sourcecredential.json", "aws-codecommit-repository.json", @@ -1037,7 +1037,6 @@ "aws-docdb-dbsubnetgroup.json", "aws-docdb-eventsubscription.json", "aws-dynamodb-table.json", - "aws-ec2-capacityreservation.json", "aws-ec2-capacityreservationfleet.json", "aws-ec2-clientvpnendpoint.json", "aws-ec2-clientvpnroute.json", @@ -1114,7 +1113,6 @@ "aws-ec2-vpcendpointservice.json", "aws-ec2-vpcendpointservicepermissions.json", "aws-ec2-vpcpeeringconnection.json", - "aws-ec2-vpnconnection.json", "aws-ec2-vpnconnectionroute.json", "aws-ec2-vpngateway.json", "aws-ec2-vpngatewayroutepropagation.json", @@ -1310,7 +1308,9 @@ "aws-logs-querydefinition.json", "aws-logs-resourcepolicy.json", "aws-logs-subscriptionfilter.json", + "aws-m2-application.json", "aws-m2-deployment.json", + "aws-m2-environment.json", "aws-msk-batchscramsecret.json", "aws-msk-cluster.json", "aws-msk-clusterpolicy.json", @@ -1318,6 +1318,7 @@ "aws-msk-vpcconnection.json", "aws-neptune-dbcluster.json", "aws-neptune-dbsubnetgroup.json", + "aws-networkfirewall-firewall.json", "aws-networkfirewall-firewallpolicy.json", "aws-networkfirewall-loggingconfiguration.json", "aws-networkfirewall-rulegroup.json", @@ -1395,7 +1396,6 @@ "aws-redshift-scheduledaction.json", "aws-redshiftserverless-namespace.json", "aws-rekognition-collection.json", - "aws-resiliencehub-app.json", "aws-resiliencehub-resiliencypolicy.json", "aws-resourcegroups-group.json", "aws-robomaker-robotapplication.json", @@ -1521,9 +1521,6 @@ "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-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_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/us_gov_west_1/aws-autoscaling-launchconfiguration.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json index fd40ebb2b7..948d4d8651 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-autoscaling-launchconfiguration.json @@ -173,9 +173,7 @@ "type": "string" }, "SecurityGroups": { - "format": "AWS::EC2::SecurityGroup.Ids", "items": { - "format": "AWS::EC2::SecurityGroup.Id", "type": "string" }, "type": "array", diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json new file mode 100644 index 0000000000..75bbdf1578 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json @@ -0,0 +1,974 @@ +{ + "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/us_gov_west_1/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-promptversion.json deleted file mode 100644 index b79f1da1a7..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-promptversion.json +++ /dev/null @@ -1,244 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/PromptArn", - "/properties/Description", - "/properties/Tags" - ], - "definitions": { - "PromptInferenceConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/PromptModelInferenceConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptInputVariable": { - "additionalProperties": false, - "properties": { - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - } - }, - "type": "object" - }, - "PromptModelInferenceConfiguration": { - "additionalProperties": false, - "properties": { - "MaxTokens": { - "maximum": 4096, - "minimum": 0, - "type": "number" - }, - "StopSequences": { - "insertionOrder": true, - "items": { - "type": "string" - }, - "maxItems": 4, - "minItems": 0, - "type": "array" - }, - "Temperature": { - "maximum": 1, - "minimum": 0, - "type": "number" - }, - "TopP": { - "maximum": 1, - "minimum": 0, - "type": "number" - } - }, - "type": "object" - }, - "PromptTemplateConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Text": { - "$ref": "#/definitions/TextPromptTemplateConfiguration" - } - }, - "required": [ - "Text" - ], - "title": "Text", - "type": "object" - } - ] - }, - "PromptTemplateType": { - "enum": [ - "TEXT" - ], - "type": "string" - }, - "PromptVariant": { - "additionalProperties": false, - "properties": { - "InferenceConfiguration": { - "$ref": "#/definitions/PromptInferenceConfiguration" - }, - "ModelId": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$", - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "TemplateConfiguration": { - "$ref": "#/definitions/PromptTemplateConfiguration" - }, - "TemplateType": { - "$ref": "#/definitions/PromptTemplateType" - } - }, - "required": [ - "Name", - "TemplateType", - "TemplateConfiguration" - ], - "type": "object" - }, - "TagsMap": { - "additionalProperties": false, - "patternProperties": { - "^[a-zA-Z0-9\\s._:/=+@-]*$": { - "maxLength": 256, - "minLength": 0, - "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$", - "type": "string" - } - }, - "type": "object" - }, - "TextPromptTemplateConfiguration": { - "additionalProperties": false, - "properties": { - "InputVariables": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptInputVariable" - }, - "maxItems": 5, - "minItems": 0, - "type": "array" - }, - "Text": { - "maxLength": 200000, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Text" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}:[0-9]{1,20})$", - "type": "string" - }, - "CreatedAt": { - "format": "date-time", - "type": "string" - }, - "CustomerEncryptionKeyArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$", - "type": "string" - }, - "DefaultVariant": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "Description": { - "maxLength": 200, - "minLength": 1, - "type": "string" - }, - "Name": { - "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", - "type": "string" - }, - "PromptArn": { - "maxLength": 2048, - "minLength": 1, - "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10})$", - "type": "string" - }, - "PromptId": { - "pattern": "^[0-9a-zA-Z]{10}$", - "type": "string" - }, - "Tags": { - "$ref": "#/definitions/TagsMap" - }, - "UpdatedAt": { - "format": "date-time", - "type": "string" - }, - "Variants": { - "insertionOrder": true, - "items": { - "$ref": "#/definitions/PromptVariant" - }, - "maxItems": 1, - "minItems": 1, - "type": "array" - }, - "Version": { - "maxLength": 5, - "minLength": 1, - "pattern": "^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/CreatedAt", - "/properties/PromptId", - "/properties/UpdatedAt", - "/properties/Version", - "/properties/Name", - "/properties/DefaultVariant", - "/properties/Variants", - "/properties/CustomerEncryptionKeyArn" - ], - "required": [ - "PromptArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-prompts", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": false, - "taggable": true - }, - "typeName": "AWS::Bedrock::PromptVersion" -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json new file mode 100644 index 0000000000..89ca2654d5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json @@ -0,0 +1,228 @@ +{ + "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/us_gov_west_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-capacityreservation.json new file mode 100644 index 0000000000..5a10969ce5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-capacityreservation.json @@ -0,0 +1,250 @@ +{ + "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/us_gov_west_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/us_gov_west_1/aws-m2-application.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-m2-application.json deleted file mode 100644 index 12f0ef73da..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-m2-application.json +++ /dev/null @@ -1,121 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/EngineType", - "/properties/Name", - "/properties/KmsKeyId", - "/properties/RoleArn" - ], - "definitions": { - "Definition": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "S3Location": { - "pattern": "^\\S{1,2000}$", - "type": "string" - } - }, - "required": [ - "S3Location" - ], - "title": "S3Location", - "type": "object" - }, - { - "additionalProperties": false, - "properties": { - "Content": { - "maxLength": 6500, - "minLength": 1, - "type": "string" - } - }, - "required": [ - "Content" - ], - "title": "Content", - "type": "object" - } - ] - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/ApplicationArn" - ], - "properties": { - "ApplicationArn": { - "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" - }, - "ApplicationId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "Definition": { - "$ref": "#/definitions/Definition" - }, - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "RoleArn": { - "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" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/ApplicationArn", - "/properties/ApplicationId" - ], - "required": [ - "EngineType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Application", - "writeOnlyProperties": [ - "/properties/Definition" - ] -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-m2-environment.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-m2-environment.json deleted file mode 100644 index eefe1e876a..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-m2-environment.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Description", - "/properties/EngineType", - "/properties/KmsKeyId", - "/properties/Name", - "/properties/NetworkType", - "/properties/PubliclyAccessible", - "/properties/SecurityGroupIds", - "/properties/StorageConfigurations", - "/properties/SubnetIds" - ], - "definitions": { - "EfsStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "EngineType": { - "enum": [ - "microfocus", - "bluage" - ], - "type": "string" - }, - "FsxStorageConfiguration": { - "additionalProperties": false, - "properties": { - "FileSystemId": { - "pattern": "^\\S{1,200}$", - "type": "string" - }, - "MountPoint": { - "pattern": "^\\S{1,200}$", - "type": "string" - } - }, - "required": [ - "FileSystemId", - "MountPoint" - ], - "type": "object" - }, - "HighAvailabilityConfig": { - "additionalProperties": false, - "properties": { - "DesiredCapacity": { - "maximum": 100, - "minimum": 1, - "type": "integer" - } - }, - "required": [ - "DesiredCapacity" - ], - "type": "object" - }, - "NetworkType": { - "enum": [ - "ipv4", - "dual" - ], - "type": "string" - }, - "StorageConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "Efs": { - "$ref": "#/definitions/EfsStorageConfiguration" - } - }, - "required": [ - "Efs" - ] - }, - { - "additionalProperties": false, - "properties": { - "Fsx": { - "$ref": "#/definitions/FsxStorageConfiguration" - } - }, - "required": [ - "Fsx" - ] - } - ], - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "maxProperties": 200, - "minProperties": 0, - "patternProperties": { - "^(?!aws:).+$": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/EnvironmentArn" - ], - "properties": { - "Description": { - "maxLength": 500, - "minLength": 0, - "type": "string" - }, - "EngineType": { - "$ref": "#/definitions/EngineType" - }, - "EngineVersion": { - "pattern": "^\\S{1,10}$", - "type": "string" - }, - "EnvironmentArn": { - "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" - }, - "EnvironmentId": { - "pattern": "^\\S{1,80}$", - "type": "string" - }, - "HighAvailabilityConfig": { - "$ref": "#/definitions/HighAvailabilityConfig" - }, - "InstanceType": { - "pattern": "^\\S{1,20}$", - "type": "string" - }, - "KmsKeyId": { - "maxLength": 2048, - "type": "string" - }, - "Name": { - "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$", - "type": "string" - }, - "NetworkType": { - "$ref": "#/definitions/NetworkType" - }, - "PreferredMaintenanceWindow": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "StorageConfigurations": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/StorageConfiguration" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "pattern": "^\\S{1,50}$", - "type": "string" - }, - "type": "array" - }, - "Tags": { - "$ref": "#/definitions/TagMap" - } - }, - "readOnlyProperties": [ - "/properties/EnvironmentArn", - "/properties/EnvironmentId" - ], - "required": [ - "EngineType", - "InstanceType", - "Name" - ], - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": true, - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::M2::Environment" -} diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-networkfirewall-firewall.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-networkfirewall-firewall.json deleted file mode 100644 index 9c49b419c5..0000000000 --- a/src/cfnlint/data/schemas/providers/us_gov_west_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/us_gov_west_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-resiliencehub-app.json new file mode 100644 index 0000000000..40b055a88b --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-resiliencehub-app.json @@ -0,0 +1,222 @@ +{ + "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/ap_south_1/aws-timestream-database.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-database.json similarity index 86% rename from src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-database.json rename to src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-database.json index f265e604f9..1b75d0d484 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-database.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-database.json @@ -50,12 +50,5 @@ "/properties/Arn" ], "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::Database" } diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-scheduledquery.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-scheduledquery.json similarity index 98% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-scheduledquery.json rename to src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-scheduledquery.json index 3520e12bbb..167de59178 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-timestream-scheduledquery.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-scheduledquery.json @@ -455,12 +455,5 @@ "ErrorReportConfiguration" ], "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::ScheduledQuery" } diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-table.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-table.json similarity index 95% rename from src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-table.json rename to src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-table.json index d5e6d3f7bf..bc876a009a 100644 --- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-timestream-table.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-timestream-table.json @@ -164,12 +164,5 @@ "DatabaseName" ], "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::Table" } diff --git a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py index 57737f359a..54ba540a44 100644 --- a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py @@ -971,6 +971,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", @@ -1312,7 +1313,6 @@ "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", @@ -1384,7 +1384,6 @@ "aws-fis-experimenttemplate.json", "aws-fis-targetaccountconfiguration.json", "aws-fms-notificationchannel.json", - "aws-fms-policy.json", "aws-fms-resourceset.json", "aws-fsx-datarepositoryassociation.json", "aws-fsx-filesystem.json", @@ -1553,6 +1552,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/us_west_1/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-acmpca-certificateauthority.json deleted file mode 100644 index 54c1fdba4c..0000000000 --- a/src/cfnlint/data/schemas/providers/us_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/us_west_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpnconnection.json new file mode 100644 index 0000000000..5f9a8ac704 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpnconnection.json @@ -0,0 +1,384 @@ +{ + "$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/us_west_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-fms-policy.json new file mode 100644 index 0000000000..8422693828 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-fms-policy.json @@ -0,0 +1,416 @@ +{ + "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/us_west_1/aws-mediaconnect-flow.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-mediaconnect-flow.json deleted file mode 100644 index 113156efe8..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_1/aws-mediaconnect-flow.json +++ /dev/null @@ -1,609 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/AvailabilityZone", - "/properties/Source/Name" - ], - "definitions": { - "AudioMonitoringSetting": { - "additionalProperties": false, - "properties": { - "SilentAudio": { - "$ref": "#/definitions/SilentAudio" - } - }, - "type": "object" - }, - "BlackFrames": { - "additionalProperties": false, - "properties": { - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThresholdSeconds": { - "type": "integer" - } - }, - "type": "object" - }, - "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" - }, - "FrozenFrames": { - "additionalProperties": false, - "properties": { - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThresholdSeconds": { - "type": "integer" - } - }, - "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" - }, - "SilentAudio": { - "additionalProperties": false, - "properties": { - "State": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThresholdSeconds": { - "type": "integer" - } - }, - "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": { - "AudioMonitoringSettings": { - "items": { - "$ref": "#/definitions/AudioMonitoringSetting" - }, - "type": "array" - }, - "ContentQualityAnalysisState": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "ThumbnailState": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "VideoMonitoringSettings": { - "items": { - "$ref": "#/definitions/VideoMonitoringSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "VideoMonitoringSetting": { - "additionalProperties": false, - "properties": { - "BlackFrames": { - "$ref": "#/definitions/BlackFrames" - }, - "FrozenFrames": { - "$ref": "#/definitions/FrozenFrames" - } - }, - "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/us_west_2/__init__.py b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py index 3e6bfdd3ce..e5aba92d6c 100644 --- a/src/cfnlint/data/schemas/providers/us_west_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py @@ -1579,6 +1579,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", @@ -1913,6 +1914,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", @@ -2320,6 +2322,7 @@ "aws-pcaconnectorad-templategroupaccesscontrolentry.json", "aws-pcaconnectorscep-challenge.json", "aws-pcaconnectorscep-connector.json", + "aws-pcs-cluster.json", "aws-pcs-computenodegroup.json", "aws-pcs-queue.json", "aws-personalize-dataset.json", @@ -2387,6 +2390,7 @@ "aws-rds-dbproxytargetgroup.json", "aws-rds-dbsecuritygroup.json", "aws-rds-dbsecuritygroupingress.json", + "aws-rds-dbshardgroup.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", "aws-rds-globalcluster.json", @@ -2601,6 +2605,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/us_west_2/aws-pcs-cluster.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-pcs-cluster.json deleted file mode 100644 index 0eb3ff4219..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_2/aws-pcs-cluster.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Networking", - "/properties/Scheduler", - "/properties/Size", - "/properties/SlurmConfiguration" - ], - "definitions": { - "AuthKey": { - "additionalProperties": false, - "properties": { - "SecretArn": { - "type": "string" - }, - "SecretVersion": { - "type": "string" - } - }, - "required": [ - "SecretArn", - "SecretVersion" - ], - "type": "object" - }, - "Endpoint": { - "additionalProperties": false, - "properties": { - "Port": { - "type": "string" - }, - "PrivateIpAddress": { - "type": "string" - }, - "PublicIpAddress": { - "type": "string" - }, - "Type": { - "enum": [ - "SLURMCTLD", - "SLURMDBD" - ], - "type": "string" - } - }, - "required": [ - "Port", - "PrivateIpAddress", - "Type" - ], - "type": "object" - }, - "ErrorInfo": { - "additionalProperties": false, - "properties": { - "Code": { - "type": "string" - }, - "Message": { - "type": "string" - } - }, - "type": "object" - }, - "SecurityGroupId": { - "format": "AWS::EC2::SecurityGroup.Id", - "pattern": "sg-\\w{8,17}", - "type": "string" - }, - "SlurmCustomSetting": { - "additionalProperties": false, - "properties": { - "ParameterName": { - "type": "string" - }, - "ParameterValue": { - "type": "string" - } - }, - "required": [ - "ParameterName", - "ParameterValue" - ], - "type": "object" - }, - "SubnetId": { - "pattern": "subnet-\\w{8,17}", - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Endpoints": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Endpoint" - }, - "type": "array" - }, - "ErrorInfo": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/ErrorInfo" - }, - "type": "array" - }, - "Id": { - "pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{1,40})$", - "type": "string" - }, - "Name": { - "type": "string" - }, - "Networking": { - "additionalProperties": false, - "properties": { - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SecurityGroupId" - }, - "type": "array" - }, - "SubnetIds": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SubnetId" - }, - "type": "array" - } - }, - "type": "object" - }, - "Scheduler": { - "additionalProperties": false, - "properties": { - "Type": { - "enum": [ - "SLURM" - ], - "type": "string" - }, - "Version": { - "type": "string" - } - }, - "required": [ - "Type", - "Version" - ], - "type": "object" - }, - "Size": { - "enum": [ - "SMALL", - "MEDIUM", - "LARGE" - ], - "type": "string" - }, - "SlurmConfiguration": { - "additionalProperties": false, - "properties": { - "AuthKey": { - "$ref": "#/definitions/AuthKey" - }, - "ScaleDownIdleTimeInSeconds": { - "minimum": 1, - "type": "integer" - }, - "SlurmCustomSettings": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/SlurmCustomSetting" - }, - "type": "array" - } - }, - "type": "object" - }, - "Status": { - "enum": [ - "CREATING", - "ACTIVE", - "UPDATING", - "DELETING", - "CREATE_FAILED", - "DELETE_FAILED", - "UPDATE_FAILED" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - "^.+$": { - "type": "string" - } - } - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Endpoints", - "/properties/ErrorInfo", - "/properties/Id", - "/properties/Status" - ], - "required": [ - "Networking", - "Scheduler", - "Size" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-pcs.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::PCS::Cluster" -} diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-rds-dbshardgroup.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-rds-dbshardgroup.json deleted file mode 100644 index 691fa97c30..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_2/aws-rds-dbshardgroup.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DBClusterIdentifier", - "/properties/DBShardGroupIdentifier", - "/properties/PubliclyAccessible" - ], - "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/DBShardGroupIdentifier" - ], - "properties": { - "ComputeRedundancy": { - "minimum": 0, - "type": "integer" - }, - "DBClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupIdentifier": { - "maxLength": 63, - "minLength": 1, - "type": "string" - }, - "DBShardGroupResourceId": { - "type": "string" - }, - "Endpoint": { - "type": "string" - }, - "MaxACU": { - "type": "number" - }, - "MinACU": { - "type": "number" - }, - "PubliclyAccessible": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/DBClusterIdentifier": "$lowercase(DBClusterIdentifier)", - "/properties/DBShardGroupIdentifier": "$lowercase(DBShardGroupIdentifier)" - }, - "readOnlyProperties": [ - "/properties/DBShardGroupResourceId", - "/properties/Endpoint" - ], - "required": [ - "DBClusterIdentifier", - "MaxACU" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": false, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::RDS::DBShardGroup", - "writeOnlyProperties": [ - "/properties/MinACU" - ] -} diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-ssmincidents-replicationset.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-ssmincidents-replicationset.json deleted file mode 100644 index aeda64f3be..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_2/aws-ssmincidents-replicationset.json +++ /dev/null @@ -1,114 +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": { - "maxLength": 2048, - "type": "string" - } - }, - "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/test/fixtures/templates/integration/ref-types.yaml b/test/fixtures/templates/integration/ref-types.yaml index a02527c846..7a92a06003 100644 --- a/test/fixtures/templates/integration/ref-types.yaml +++ b/test/fixtures/templates/integration/ref-types.yaml @@ -43,18 +43,22 @@ Resources: Properties: CidrBlock: 10.0.2.0/24 VpcId: !Ref FargateTaskRole # Wrong type - SecurityGroup: + SecurityGroup1: Type: AWS::EC2::SecurityGroup Properties: GroupDescription: SG VpcId: !Ref Vpc + SecurityGroup2: + Type: AWS::EC2::SecurityGroup + Properties: + GroupDescription: SG LoadBalancer: Type: AWS::ElasticLoadBalancingV2::LoadBalancer Properties: Type: application Scheme: internal SecurityGroups: - - !Ref SecurityGroup + - !Ref SecurityGroup1 Subnets: - !Ref Subnet1 - !Ref Subnet2 @@ -104,3 +108,12 @@ Resources: RequiresCompatibilities: - FARGATE TaskRoleArn: !GetAtt 'FargateTaskRole.Arn' + LaunchConfiguration: + Type: AWS::AutoScaling::LaunchConfiguration + Properties: + ImageId: ami-abcdef12 + InstanceType: t3.micro + AssociatePublicIpAddress: false + SecurityGroups: + - !Ref SecurityGroup1 + - !Ref SecurityGroup2