diff --git a/src/cfnlint/data/AdditionalSpecs/Policies.json b/src/cfnlint/data/AdditionalSpecs/Policies.json index d71de88297..5c166ed54f 100644 --- a/src/cfnlint/data/AdditionalSpecs/Policies.json +++ b/src/cfnlint/data/AdditionalSpecs/Policies.json @@ -627,16 +627,20 @@ "AssociateApi", "AssociateMergedGraphqlApi", "AssociateSourceGraphqlApi", + "CreateApi", "CreateApiCache", "CreateApiKey", + "CreateChannelNamespace", "CreateDataSource", "CreateDomainName", "CreateFunction", "CreateGraphqlApi", "CreateResolver", "CreateType", + "DeleteApi", "DeleteApiCache", "DeleteApiKey", + "DeleteChannelNamespace", "DeleteDataSource", "DeleteDomainName", "DeleteFunction", @@ -649,9 +653,14 @@ "DisassociateSourceGraphqlApi", "EvaluateCode", "EvaluateMappingTemplate", + "EventConnect", + "EventPublish", + "EventSubscribe", "FlushApiCache", + "GetApi", "GetApiAssociation", "GetApiCache", + "GetChannelNamespace", "GetDataSource", "GetDataSourceIntrospection", "GetDomainName", @@ -666,6 +675,8 @@ "GetType", "GraphQL", "ListApiKeys", + "ListApis", + "ListChannelNamespaces", "ListDataSources", "ListDomainNames", "ListFunctions", @@ -685,8 +696,10 @@ "StartSchemaMerge", "TagResource", "UntagResource", + "UpdateApi", "UpdateApiCache", "UpdateApiKey", + "UpdateChannelNamespace", "UpdateDataSource", "UpdateDomainName", "UpdateFunction", @@ -10598,6 +10611,7 @@ "Actions": [ "BatchDeleteTaxRegistration", "BatchPutTaxRegistration", + "DeleteSupplementalTaxRegistration", "DeleteTaxRegistration", "GetExemptions", "GetTaxInfoReportingDocument", @@ -10605,7 +10619,9 @@ "GetTaxInterview", "GetTaxRegistration", "GetTaxRegistrationDocument", + "ListSupplementalTaxRegistrations", "ListTaxRegistrations", + "PutSupplementalTaxRegistration", "PutTaxInheritance", "PutTaxInterview", "PutTaxRegistration", @@ -12636,6 +12652,7 @@ "GetTopologyMap", "Link", "ListDashboards", + "ListEntitiesForMetric", "ListManagedInsightRules", "ListMetricStreams", "ListMetrics", @@ -14273,6 +14290,7 @@ "ARNFormat": "arn:aws:docdb-elastic:${Region}:${Account}:${ResourceType}/${ResourceId}", "ARNRegex": "^arn:aws:docdb-elastic:.+:.+:.+", "Actions": [ + "ApplyPendingMaintenanceAction", "CopyClusterSnapshot", "CreateCluster", "CreateClusterSnapshot", @@ -14280,8 +14298,10 @@ "DeleteClusterSnapshot", "GetCluster", "GetClusterSnapshot", + "GetPendingMaintenanceAction", "ListClusterSnapshots", "ListClusters", + "ListPendingMaintenanceActions", "ListTagsForResource", "RestoreClusterFromSnapshot", "StartCluster", @@ -14430,6 +14450,7 @@ "ARNRegex": "^arn:aws:ec2:.+", "Actions": [ "AcceptAddressTransfer", + "AcceptCapacityReservationBillingOwnership", "AcceptReservedInstancesExchangeQuote", "AcceptTransitGatewayMulticastDomainAssociations", "AcceptTransitGatewayPeeringAttachment", @@ -14445,6 +14466,7 @@ "AssignPrivateIpAddresses", "AssignPrivateNatGatewayAddress", "AssociateAddress", + "AssociateCapacityReservationBillingOwner", "AssociateClientVpnTargetNetwork", "AssociateDhcpOptions", "AssociateEnclaveCertificateIamRole", @@ -14454,6 +14476,7 @@ "AssociateIpamResourceDiscovery", "AssociateNatGatewayAddress", "AssociateRouteTable", + "AssociateSecurityGroupVpc", "AssociateSubnetCidrBlock", "AssociateTransitGatewayMulticastDomain", "AssociateTransitGatewayPolicyTable", @@ -14667,6 +14690,7 @@ "DescribeBundleTasks", "DescribeByoipCidrs", "DescribeCapacityBlockOfferings", + "DescribeCapacityReservationBillingRequests", "DescribeCapacityReservationFleets", "DescribeCapacityReservations", "DescribeCarrierGateways", @@ -14707,6 +14731,7 @@ "DescribeInstanceCreditSpecifications", "DescribeInstanceEventNotificationAttributes", "DescribeInstanceEventWindows", + "DescribeInstanceImageMetadata", "DescribeInstanceStatus", "DescribeInstanceTopology", "DescribeInstanceTypeOfferings", @@ -14759,6 +14784,7 @@ "DescribeScheduledInstances", "DescribeSecurityGroupReferences", "DescribeSecurityGroupRules", + "DescribeSecurityGroupVpcAssociations", "DescribeSecurityGroups", "DescribeSnapshotAttribute", "DescribeSnapshotTierStatus", @@ -14834,6 +14860,7 @@ "DisableVpcClassicLink", "DisableVpcClassicLinkDnsSupport", "DisassociateAddress", + "DisassociateCapacityReservationBillingOwner", "DisassociateClientVpnTargetNetwork", "DisassociateEnclaveCertificateIamRole", "DisassociateIamInstanceProfile", @@ -14842,6 +14869,7 @@ "DisassociateIpamResourceDiscovery", "DisassociateNatGatewayAddress", "DisassociateRouteTable", + "DisassociateSecurityGroupVpc", "DisassociateSubnetCidrBlock", "DisassociateTransitGatewayMulticastDomain", "DisassociateTransitGatewayPolicyTable", @@ -14948,6 +14976,7 @@ "ModifyImageAttribute", "ModifyInstanceAttribute", "ModifyInstanceCapacityReservationAttributes", + "ModifyInstanceCpuOptions", "ModifyInstanceCreditSpecification", "ModifyInstanceEventStartTime", "ModifyInstanceEventWindow", @@ -15017,6 +15046,7 @@ "RegisterInstanceEventNotificationAttributes", "RegisterTransitGatewayMulticastGroupMembers", "RegisterTransitGatewayMulticastGroupSources", + "RejectCapacityReservationBillingOwnership", "RejectTransitGatewayMulticastDomainAssociations", "RejectTransitGatewayPeeringAttachment", "RejectTransitGatewayVpcAttachment", @@ -15847,6 +15877,8 @@ "PutBackupPolicy", "PutFileSystemPolicy", "PutLifecycleConfiguration", + "ReplicationRead", + "ReplicationWrite", "Restore", "TagResource", "UntagResource", @@ -17893,6 +17925,44 @@ "geo:GeofenceIds" ] }, + "Amazon Location Service Maps": { + "ARNFormat": "arn:aws:geo-maps:${Region}::provider/default", + "ARNRegex": "^arn:aws:geo-maps:.+", + "Actions": [ + "GetStaticMap", + "GetTile" + ], + "HasResource": true, + "StringPrefix": "geo-maps" + }, + "Amazon Location Service Places": { + "ARNFormat": "arn:aws:geo-places:${Region}::provider/default", + "ARNRegex": "^arn:aws:geo-places:.+", + "Actions": [ + "Autocomplete", + "Geocode", + "GetPlace", + "ReverseGeocode", + "SearchNearby", + "SearchText", + "Suggest" + ], + "HasResource": true, + "StringPrefix": "geo-places" + }, + "Amazon Location Service Routes": { + "ARNFormat": "arn:aws:geo-routes:${Region}::provider/default", + "ARNRegex": "^arn:aws:geo-routes:.+", + "Actions": [ + "CalculateIsolines", + "CalculateRouteMatrix", + "CalculateRoutes", + "OptimizeWaypoints", + "SnapToRoads" + ], + "HasResource": true, + "StringPrefix": "geo-routes" + }, "Amazon Lookout for Equipment": { "ARNFormat": "arn:aws:lookoutequipment:${Region}:${Account}:${ResourceType}/${ResourceName}/${ResourceId}", "ARNRegex": "^arn:aws:lookoutequipment:.+:.+:.+", @@ -18351,6 +18421,7 @@ "TagResource", "UntagResource", "UpdateLoggingConfiguration", + "UpdateScraper", "UpdateWorkspaceAlias" ], "HasResource": true, @@ -23207,6 +23278,7 @@ "DeleteEnvironment", "DeregisterDevice", "GetDevice", + "GetDeviceDetails", "GetEnvironment", "GetSoftwareSet", "ListDeviceSessions", diff --git a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json index 288bf1926e..6e85939a3c 100644 --- a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json @@ -1 +1 @@ -{"etag": "\"140b6010748283e74917a0e4c066d867\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"de36e43dd7a97e0df894bd3a492ef0d2\"", "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 01f30d53ea..5991b9e2fe 100644 --- a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json @@ -1 +1 @@ -{"etag": "\"1262317fb56cbb34858fabe519fdd410\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"} +{"etag": "\"a88f49276f70099b30a676674f2d2e09\"", "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 2a9f0e4f12..f28128cdda 100644 --- a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json @@ -1 +1 @@ -{"etag": "\"00311ca48fedb96740542086f2b9d02a\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"e883cba4b52bd486689be2590182302e\"", "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 c4cefeeb8e..e6e6581ab3 100644 --- a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json @@ -1 +1 @@ -{"etag": "\"2bd7184ed2b52d8791cd16d7b33591c9\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"dabda94e45dfc9d5c84a459da91edd2c\"", "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 e80794a1aa..656a1e8b5e 100644 --- a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json @@ -1 +1 @@ -{"etag": "\"d8e3f36dbd902bf48c6b308fca3e4105\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"b6a93fd4200882e33932f3977cf81d2d\"", "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 a8162b9ee2..c70395cede 100644 --- a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json @@ -1 +1 @@ -{"etag": "\"144126c4427078feca5ef83ded64e48b\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"4f43511a9ffab323502e6bc239ceb1cb\"", "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 9c0ec7b485..fb363008a9 100644 --- a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json @@ -1 +1 @@ -{"etag": "\"57f2d974a85711d87a6ad29266c7b2d9\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"679ee3121552f93003a6865d0301f95f\"", "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 28f8450a27..e7d06f6155 100644 --- a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json @@ -1 +1 @@ -{"etag": "\"18909b3a12c27ac81d110c95b8c6d07e\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"} +{"etag": "\"11d1b4b6102578b479d6e21c3363b07a\"", "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 cf5338fae8..4952ed9c0f 100644 --- a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json @@ -1 +1 @@ -{"etag": "\"f228dca24042b4bf4423e91caa58a648\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"27b6da5c397a933570f50b9c2c6a8db8\"", "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 6da4ad0c32..18e8d6788a 100644 --- a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json @@ -1 +1 @@ -{"etag": "\"cd15458f5c290a953645de4ef2329a43\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"4c9cb5a4d498a6466009723774049dbe\"", "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 e85657a9be..063a1a58a4 100644 --- a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json @@ -1 +1 @@ -{"etag": "\"9efa568ad1af33d89b50abfb69bff565\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"373fbfcbc30675927cd1309efe5bb12a\"", "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 38ebd7e115..271f08ca3a 100644 --- a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json @@ -1 +1 @@ -{"etag": "\"2a518b994acae465a78eecda32f5a7b2\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"520442db355318cdc3026536d0986cc4\"", "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 4e5686c7cd..e73c992ee9 100644 --- a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json @@ -1 +1 @@ -{"etag": "\"72ce524d436e9f446f88b26066d9912d\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"d273c61b83b327ae7062f9e0252c380e\"", "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 b119e08fa9..773aca6b7d 100644 --- a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json @@ -1 +1 @@ -{"etag": "\"41fdcc7535121b6be41e343de75969ff\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"2c5ccaaac2f27b06d22c2a84f14eb02c\"", "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 1d041ec858..2b9749b592 100644 --- a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json @@ -1 +1 @@ -{"etag": "\"ca5451e56b3bc8a37c67b5853ec9f891\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"05c3d261559c11126a7fa79437cdb1c1\"", "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 39fbdd7572..c57c6bad56 100644 --- a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json @@ -1 +1 @@ -{"etag": "\"c696d21cd3eadaf8fb3c2b8b7435c628\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"b17b43b6c7bd34f3af6de3f406c397fe\"", "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 360f50c7c6..59d9301400 100644 --- a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json @@ -1 +1 @@ -{"etag": "\"5909723838a2b34b540b1494c6498310\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"bfa883bf8bb8596d24a9233f0df1daf0\"", "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 c2f761691c..f742ab9d60 100644 --- a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json @@ -1 +1 @@ -{"etag": "\"d94362de24bfe0f4771cbf03b90e96d8\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"29da5b62780e15423d7c2526d453d938\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json index 619246dfc3..b1b689bc9d 100644 --- a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json @@ -1 +1 @@ -{"etag": "\"eeab779c2d21c775defe9572bb7822b5\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"10122da694bede181ecd4161716c4a1a\"", "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 e6dc61d690..0adfdd69dc 100644 --- a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json @@ -1 +1 @@ -{"etag": "\"7e77564f3abeffc2448be4ba3c108fba\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"762c320a99d47d730b90c9eee0fe5dde\"", "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 44ecc2d06b..b1f94597a3 100644 --- a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json @@ -1 +1 @@ -{"etag": "\"697b91eea5d62d7615f024996ae79bd2\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"f79ef6f7885ba2aebe764889cb08b17d\"", "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 787aac891d..321bf1d303 100644 --- a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json @@ -1 +1 @@ -{"etag": "\"48955aeec8376fac8e745ab49ac2b576\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"a338d2c54eac4177e5e296627ef1ec65\"", "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 278564f3b1..f570235162 100644 --- a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json @@ -1 +1 @@ -{"etag": "\"545b348634401ed6f494edd91acccb2e\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"8e8aef22a73df8aac450d1c66839de7c\"", "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 aebcb23f3d..ffb96ded50 100644 --- a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json @@ -1 +1 @@ -{"etag": "\"13d76d8d5c4b7079a18159f729835cab\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"abff77b737994051678f96052059e865\"", "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 ecb595e389..3a8efff4a6 100644 --- a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json @@ -1 +1 @@ -{"etag": "\"7d93294226e06db96e89f9a0c907d970\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"224423005368d8372dbc2d283eb4eade\"", "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 4da5d5847d..42dc8754f5 100644 --- a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json @@ -1 +1 @@ -{"etag": "\"cf842eb009849c22b0c2298df346e5bc\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"161ae50297b59b11b0c20c799141e957\"", "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 b9d8ba11f9..cabc650318 100644 --- a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json @@ -1 +1 @@ -{"etag": "\"53180d118d6e66e02038b8976163604f\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"0769a85d26a4a54997a12b3c14c16d4c\"", "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 5f3205dac6..d11d969aa2 100644 --- a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json @@ -1 +1 @@ -{"etag": "\"06c3f20628dfaa6837e7034b3670f568\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"dd65610a40912779b8e996dca8a6e526\"", "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 f26afa828a..5199815f6f 100644 --- a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json @@ -1 +1 @@ -{"etag": "\"35ada81ff6152c5bf47c53d6eaf30ac0\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"2678b4c8b1eef670985b6ce766f059b9\"", "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 98b9a72632..6f07ed9684 100644 --- a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json @@ -1 +1 @@ -{"etag": "\"dfed8922b0e77091ca90e2fa67a37be7\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"fe1a9d1fc626900dde23da820baa6000\"", "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 197c73f657..c2437b6c49 100644 --- a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json @@ -1 +1 @@ -{"etag": "\"da2f42e31716f030ca6122c550744ebd\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"f2c8422d985c259aae829e5b9df55cf0\"", "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 9dc840069b..94859f997a 100644 --- a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json @@ -1 +1 @@ -{"etag": "\"da5f2a8a910f841f403085725a3161e4\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"9a85fb289ed577c7c5e49c678f0b77c3\"", "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 2e754b22c5..a0820b5495 100644 --- a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json @@ -1 +1 @@ -{"etag": "\"e8746f49c9418430ff61fe82b70567a8\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"c42f41acfb73c2b6701b83c459ee2009\"", "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 13a83f141f..fc11bbc637 100644 --- a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json +++ b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json @@ -1 +1 @@ -{"etag": "\"d3f31bb469488688bc7f5d9da1cceab4\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"} +{"etag": "\"54aeca8cd6ee92f338795e429122edd4\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"} diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json index e5682d3866..10b98c7c79 100644 --- a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json +++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json @@ -31999,6 +31999,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -32099,6 +32108,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -32196,6 +32214,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -32296,6 +32323,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -32522,6 +32558,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -32622,6 +32667,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -33378,6 +33432,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -33478,6 +33541,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -33575,6 +33647,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -33675,6 +33756,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -33772,6 +33862,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -33872,6 +33971,15 @@ "db.r6gd.8xlarge", "db.r6gd.large", "db.r6gd.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -36327,6 +36435,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -36445,6 +36562,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -36560,6 +36686,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -36678,6 +36813,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -36793,6 +36937,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -36911,6 +37064,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -37227,6 +37389,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -37345,6 +37516,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -37771,6 +37951,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -37889,6 +38078,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -38004,6 +38202,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -38122,6 +38329,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -62407,6 +62623,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -62429,6 +62654,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -62498,6 +62732,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -62520,6 +62763,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -62586,6 +62838,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -62609,6 +62870,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -62678,6 +62948,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -62701,6 +62980,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -62767,6 +63055,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -62789,6 +63086,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -62858,6 +63164,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -62880,6 +63195,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -63585,7 +63909,7 @@ "type": "string" }, "Engine": { - "const": "mariadb" + "const": "mysql" }, "LicenseModel": false }, @@ -63627,6 +63951,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -63649,6 +63982,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -63673,7 +64015,7 @@ "type": "string" }, "Engine": { - "const": "mariadb" + "const": "mysql" }, "LicenseModel": { "const": "general-public-license" @@ -63718,6 +64060,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -63740,6 +64091,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -63764,7 +64124,7 @@ "type": "string" }, "Engine": { - "const": "mysql" + "const": "mariadb" }, "LicenseModel": false }, @@ -63806,6 +64166,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -63828,6 +64197,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -63852,7 +64230,7 @@ "type": "string" }, "Engine": { - "const": "mysql" + "const": "mariadb" }, "LicenseModel": { "const": "general-public-license" @@ -63897,6 +64275,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -63919,6 +64306,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -63985,6 +64381,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -64007,6 +64412,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -64076,6 +64490,15 @@ "db.m7g.8xlarge", "db.m7g.large", "db.m7g.xlarge", + "db.m7i.12xlarge", + "db.m7i.16xlarge", + "db.m7i.24xlarge", + "db.m7i.2xlarge", + "db.m7i.48xlarge", + "db.m7i.4xlarge", + "db.m7i.8xlarge", + "db.m7i.large", + "db.m7i.xlarge", "db.r5.12xlarge", "db.r5.16xlarge", "db.r5.24xlarge", @@ -64098,6 +64521,15 @@ "db.r7g.8xlarge", "db.r7g.large", "db.r7g.xlarge", + "db.r7i.12xlarge", + "db.r7i.16xlarge", + "db.r7i.24xlarge", + "db.r7i.2xlarge", + "db.r7i.48xlarge", + "db.r7i.4xlarge", + "db.r7i.8xlarge", + "db.r7i.large", + "db.r7i.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -97219,7 +97651,6 @@ "db.r5d.8xlarge", "db.r5d.large", "db.r5d.xlarge", - "db.r6i.12xlarge", "db.r6i.16xlarge", "db.r6i.24xlarge", "db.r6i.2xlarge", @@ -97240,12 +97671,6 @@ "db.r6i.xlarge", "db.r6i.xlarge.tpc2.mem2x", "db.r6i.xlarge.tpc2.mem4x", - "db.t2.2xlarge", - "db.t2.large", - "db.t2.medium", - "db.t2.micro", - "db.t2.small", - "db.t2.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", @@ -98970,12 +99395,6 @@ "db.r6i.xlarge", "db.r6i.xlarge.tpc2.mem2x", "db.r6i.xlarge.tpc2.mem4x", - "db.t2.2xlarge", - "db.t2.large", - "db.t2.medium", - "db.t2.micro", - "db.t2.small", - "db.t2.xlarge", "db.t3.2xlarge", "db.t3.large", "db.t3.medium", diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/boto.json index 3538d61303..38fb0d1447 100644 --- a/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/boto.json +++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_codebuild_project/boto.json @@ -20,6 +20,7 @@ "op": "add", "path": "/definitions/Environment/properties/ComputeType/enum", "value": [ + "ATTRIBUTE_BASED_COMPUTE", "BUILD_GENERAL1_2XLARGE", "BUILD_GENERAL1_LARGE", "BUILD_GENERAL1_MEDIUM", 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 073e9d30e6..552187554b 100644 --- a/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py @@ -1237,6 +1237,7 @@ "AWS::WAFv2::WebACL", "AWS::WAFv2::WebACLAssociation", "AWS::Wisdom::AIAgent", + "AWS::Wisdom::AIAgentVersion", "AWS::Wisdom::AIPrompt", "AWS::Wisdom::AIPromptVersion", "AWS::Wisdom::Assistant", @@ -2478,6 +2479,7 @@ "aws-wafv2-webacl.json", "aws-wafv2-webaclassociation.json", "aws-wisdom-aiagent.json", + "aws-wisdom-aiagentversion.json", "aws-wisdom-aiprompt.json", "aws-wisdom-aipromptversion.json", "aws-wisdom-assistant.json", 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 cb39c71663..b758ad9396 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py @@ -1206,6 +1206,7 @@ "AWS::WAFv2::WebACL", "AWS::WAFv2::WebACLAssociation", "AWS::Wisdom::AIAgent", + "AWS::Wisdom::AIAgentVersion", "AWS::Wisdom::AIPrompt", "AWS::Wisdom::AIPromptVersion", "AWS::Wisdom::Assistant", @@ -2071,7 +2072,6 @@ "aws-networkmanager-transitgatewayregistration.json", "aws-networkmanager-transitgatewayroutetableattachment.json", "aws-networkmanager-vpcattachment.json", - "aws-nimblestudio-studio.json", "aws-oam-link.json", "aws-oam-sink.json", "aws-opensearchserverless-accesspolicy.json", @@ -2411,6 +2411,7 @@ "aws-wafv2-webacl.json", "aws-wafv2-webaclassociation.json", "aws-wisdom-aiagent.json", + "aws-wisdom-aiagentversion.json", "aws-wisdom-aiprompt.json", "aws-wisdom-aipromptversion.json", "aws-wisdom-assistant.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-nimblestudio-studio.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-nimblestudio-studio.json new file mode 100644 index 0000000000..bd6fcbeb38 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-nimblestudio-studio.json @@ -0,0 +1,99 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/StudioName", + "/properties/Tags" + ], + "definitions": { + "StudioEncryptionConfiguration": { + "additionalProperties": false, + "properties": { + "KeyArn": { + "minLength": 4, + "pattern": "^arn:.*", + "type": "string" + }, + "KeyType": { + "$ref": "#/definitions/StudioEncryptionConfigurationKeyType" + } + }, + "required": [ + "KeyType" + ], + "type": "object" + }, + "StudioEncryptionConfigurationKeyType": { + "enum": [ + "AWS_OWNED_KEY", + "CUSTOMER_MANAGED_KEY" + ], + "type": "string" + }, + "Tags": { + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + }, + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/StudioId" + ], + "properties": { + "AdminRoleArn": { + "type": "string" + }, + "DisplayName": { + "maxLength": 64, + "minLength": 0, + "type": "string" + }, + "HomeRegion": { + "maxLength": 50, + "minLength": 0, + "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]", + "type": "string" + }, + "SsoClientId": { + "type": "string" + }, + "StudioEncryptionConfiguration": { + "$ref": "#/definitions/StudioEncryptionConfiguration" + }, + "StudioId": { + "type": "string" + }, + "StudioName": { + "maxLength": 64, + "minLength": 3, + "pattern": "^[a-z0-9]*$", + "type": "string" + }, + "StudioUrl": { + "type": "string" + }, + "Tags": { + "$ref": "#/definitions/Tags" + }, + "UserRoleArn": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/HomeRegion", + "/properties/SsoClientId", + "/properties/StudioId", + "/properties/StudioUrl" + ], + "required": [ + "DisplayName", + "UserRoleArn", + "AdminRoleArn", + "StudioName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", + "typeName": "AWS::NimbleStudio::Studio" +} 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 70f01abb56..ca485d1319 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py @@ -1229,6 +1229,7 @@ "AWS::WAFv2::WebACL", "AWS::WAFv2::WebACLAssociation", "AWS::Wisdom::AIAgent", + "AWS::Wisdom::AIAgentVersion", "AWS::Wisdom::AIPrompt", "AWS::Wisdom::AIPromptVersion", "AWS::Wisdom::Assistant", @@ -2456,6 +2457,7 @@ "aws-wafv2-webacl.json", "aws-wafv2-webaclassociation.json", "aws-wisdom-aiagent.json", + "aws-wisdom-aiagentversion.json", "aws-wisdom-aiprompt.json", "aws-wisdom-aipromptversion.json", "aws-wisdom-assistant.json", 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 121d9421e7..bacd69e00a 100644 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py +++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py @@ -820,6 +820,7 @@ "aws-datasync-locationobjectstorage.json", "aws-datasync-locations3.json", "aws-datasync-locationsmb.json", + "aws-datasync-task.json", "aws-dlm-lifecyclepolicy.json", "aws-dms-datamigration.json", "aws-dms-dataprovider.json", @@ -993,11 +994,13 @@ "aws-iam-usertogroupaddition.json", "aws-identitystore-group.json", "aws-identitystore-groupmembership.json", + "aws-imagebuilder-component.json", "aws-imagebuilder-containerrecipe.json", "aws-imagebuilder-distributionconfiguration.json", "aws-imagebuilder-image.json", "aws-imagebuilder-imagepipeline.json", "aws-imagebuilder-imagerecipe.json", + "aws-imagebuilder-infrastructureconfiguration.json", "aws-imagebuilder-lifecyclepolicy.json", "aws-imagebuilder-workflow.json", "aws-internetmonitor-monitor.json", diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-datasync-task.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-datasync-task.json deleted file mode 100644 index 1f164cf132..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-datasync-task.json +++ /dev/null @@ -1,482 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/DestinationLocationArn", - "/properties/SourceLocationArn" - ], - "definitions": { - "DestinationNetworkInterfaceArns": { - "insertionOrder": false, - "items": { - "pattern": "^arn:aws[\\-a-z]{0,}:ec2:[a-z\\-0-9]*:[0-9]{12}:network-interface/eni-[0-9a-f]+$", - "type": "string" - }, - "maxItems": 128, - "type": "array" - }, - "FilterRule": { - "additionalProperties": false, - "properties": { - "FilterType": { - "enum": [ - "SIMPLE_PATTERN" - ], - "maxLength": 128, - "pattern": "^[A-Z0-9_]+$", - "type": "string" - }, - "Value": { - "maxLength": 409600, - "pattern": "^[^\\x00]+$", - "type": "string" - } - }, - "type": "object" - }, - "ManifestConfig": { - "additionalProperties": false, - "properties": { - "Action": { - "enum": [ - "TRANSFER" - ], - "type": "string" - }, - "Format": { - "enum": [ - "CSV" - ], - "type": "string" - }, - "Source": { - "additionalProperties": false, - "properties": { - "S3": { - "$ref": "#/definitions/ManifestConfigSourceS3" - } - }, - "type": "object" - } - }, - "required": [ - "Source" - ], - "type": "object" - }, - "ManifestConfigSourceS3": { - "additionalProperties": false, - "properties": { - "BucketAccessRoleArn": { - "maxLength": 2048, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):iam::[0-9]{12}:role/.*$", - "type": "string" - }, - "ManifestObjectPath": { - "maxLength": 1024, - "pattern": "^[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}\\p{C}]*$", - "type": "string" - }, - "ManifestObjectVersionId": { - "maxLength": 100, - "pattern": "^.+$", - "type": "string" - }, - "S3BucketArn": { - "maxLength": 156, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\\-0-9]*:[0-9]*:.*$", - "type": "string" - } - }, - "type": "object" - }, - "Options": { - "additionalProperties": false, - "properties": { - "Atime": { - "enum": [ - "NONE", - "BEST_EFFORT" - ], - "type": "string" - }, - "BytesPerSecond": { - "format": "int64", - "minimum": -1, - "type": "integer" - }, - "Gid": { - "enum": [ - "NONE", - "INT_VALUE", - "NAME", - "BOTH" - ], - "type": "string" - }, - "LogLevel": { - "enum": [ - "OFF", - "BASIC", - "TRANSFER" - ], - "type": "string" - }, - "Mtime": { - "enum": [ - "NONE", - "PRESERVE" - ], - "type": "string" - }, - "ObjectTags": { - "enum": [ - "PRESERVE", - "NONE" - ], - "type": "string" - }, - "OverwriteMode": { - "enum": [ - "ALWAYS", - "NEVER" - ], - "type": "string" - }, - "PosixPermissions": { - "enum": [ - "NONE", - "PRESERVE" - ], - "type": "string" - }, - "PreserveDeletedFiles": { - "enum": [ - "PRESERVE", - "REMOVE" - ], - "type": "string" - }, - "PreserveDevices": { - "enum": [ - "NONE", - "PRESERVE" - ], - "type": "string" - }, - "SecurityDescriptorCopyFlags": { - "enum": [ - "NONE", - "OWNER_DACL", - "OWNER_DACL_SACL" - ], - "type": "string" - }, - "TaskQueueing": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "TransferMode": { - "enum": [ - "CHANGED", - "ALL" - ], - "type": "string" - }, - "Uid": { - "enum": [ - "NONE", - "INT_VALUE", - "NAME", - "BOTH" - ], - "type": "string" - }, - "VerifyMode": { - "enum": [ - "POINT_IN_TIME_CONSISTENT", - "ONLY_FILES_TRANSFERRED", - "NONE" - ], - "type": "string" - } - }, - "type": "object" - }, - "SourceNetworkInterfaceArns": { - "insertionOrder": false, - "items": { - "pattern": "^arn:aws[\\-a-z]{0,}:ec2:[a-z\\-0-9]*:[0-9]{12}:network-interface/eni-[0-9a-f]+$", - "type": "string" - }, - "maxItems": 128, - "type": "array" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 256, - "minLength": 1, - "pattern": "^[a-zA-Z0-9\\s+=._:/-]+$", - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 1, - "pattern": "^[a-zA-Z0-9\\s+=._:@/-]+$", - "type": "string" - } - }, - "required": [ - "Key", - "Value" - ], - "type": "object" - }, - "TaskReportConfig": { - "additionalProperties": false, - "properties": { - "Destination": { - "additionalProperties": false, - "properties": { - "S3": { - "$ref": "#/definitions/TaskReportConfigDestinationS3" - } - }, - "type": "object" - }, - "ObjectVersionIds": { - "enum": [ - "INCLUDE", - "NONE" - ], - "type": "string" - }, - "OutputType": { - "enum": [ - "SUMMARY_ONLY", - "STANDARD" - ], - "type": "string" - }, - "Overrides": { - "additionalProperties": false, - "properties": { - "Deleted": { - "additionalProperties": false, - "properties": { - "ReportLevel": { - "enum": [ - "ERRORS_ONLY", - "SUCCESSES_AND_ERRORS" - ], - "type": "string" - } - }, - "type": "object" - }, - "Skipped": { - "additionalProperties": false, - "properties": { - "ReportLevel": { - "enum": [ - "ERRORS_ONLY", - "SUCCESSES_AND_ERRORS" - ], - "type": "string" - } - }, - "type": "object" - }, - "Transferred": { - "additionalProperties": false, - "properties": { - "ReportLevel": { - "enum": [ - "ERRORS_ONLY", - "SUCCESSES_AND_ERRORS" - ], - "type": "string" - } - }, - "type": "object" - }, - "Verified": { - "additionalProperties": false, - "properties": { - "ReportLevel": { - "enum": [ - "ERRORS_ONLY", - "SUCCESSES_AND_ERRORS" - ], - "type": "string" - } - }, - "type": "object" - } - }, - "type": "object" - }, - "ReportLevel": { - "enum": [ - "ERRORS_ONLY", - "SUCCESSES_AND_ERRORS" - ], - "type": "string" - } - }, - "required": [ - "Destination", - "OutputType" - ], - "type": "object" - }, - "TaskReportConfigDestinationS3": { - "additionalProperties": false, - "properties": { - "BucketAccessRoleArn": { - "maxLength": 2048, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):iam::[0-9]{12}:role/.*$", - "type": "string" - }, - "S3BucketArn": { - "maxLength": 156, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):(s3|s3-outposts):[a-z\\-0-9]*:[0-9]*:.*$", - "type": "string" - }, - "Subdirectory": { - "maxLength": 4096, - "pattern": "^[a-zA-Z0-9_\\-\\+\\./\\(\\)\\p{Zs}]*$", - "type": "string" - } - }, - "type": "object" - }, - "TaskSchedule": { - "additionalProperties": false, - "properties": { - "ScheduleExpression": { - "maxLength": 256, - "pattern": "^[a-zA-Z0-9\\ \\_\\*\\?\\,\\|\\^\\-\\/\\#\\s\\(\\)\\+]*$", - "type": "string" - }, - "Status": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/TaskArn" - ], - "properties": { - "CloudWatchLogGroupArn": { - "maxLength": 562, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):logs:[a-z\\-0-9]*:[0-9]{12}:log-group:([^:\\*]*)(:\\*)?$", - "type": "string" - }, - "DestinationLocationArn": { - "maxLength": 128, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):datasync:[a-z\\-0-9]+:[0-9]{12}:location/loc-[0-9a-z]{17}$", - "type": "string" - }, - "DestinationNetworkInterfaceArns": { - "$ref": "#/definitions/DestinationNetworkInterfaceArns" - }, - "Excludes": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/FilterRule" - }, - "maxItems": 1, - "minItems": 0, - "type": "array" - }, - "Includes": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/FilterRule" - }, - "maxItems": 1, - "minItems": 0, - "type": "array" - }, - "ManifestConfig": { - "$ref": "#/definitions/ManifestConfig" - }, - "Name": { - "maxLength": 256, - "minLength": 1, - "pattern": "^[a-zA-Z0-9\\s+=._:@/-]+$", - "type": "string" - }, - "Options": { - "$ref": "#/definitions/Options" - }, - "Schedule": { - "$ref": "#/definitions/TaskSchedule" - }, - "SourceLocationArn": { - "maxLength": 128, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):datasync:[a-z\\-0-9]+:[0-9]{12}:location/loc-[0-9a-z]{17}$", - "type": "string" - }, - "SourceNetworkInterfaceArns": { - "$ref": "#/definitions/SourceNetworkInterfaceArns" - }, - "Status": { - "enum": [ - "AVAILABLE", - "CREATING", - "QUEUED", - "RUNNING", - "UNAVAILABLE" - ], - "type": "string" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - }, - "TaskArn": { - "maxLength": 128, - "pattern": "^arn:(aws|aws-cn|aws-us-gov|aws-iso|aws-iso-b):datasync:[a-z\\-0-9]*:[0-9]{12}:task/task-[0-9a-f]{17}$", - "type": "string" - }, - "TaskReportConfig": { - "$ref": "#/definitions/TaskReportConfig" - } - }, - "readOnlyProperties": [ - "/properties/TaskArn", - "/properties/Status", - "/properties/SourceNetworkInterfaceArns", - "/properties/DestinationNetworkInterfaceArns" - ], - "required": [ - "DestinationLocationArn", - "SourceLocationArn" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datasync.git", - "tagging": { - "cloudFormationSystemTags": true, - "tagOnCreate": true, - "tagProperty": "/properties/Tags", - "tagUpdatable": true, - "taggable": true - }, - "typeName": "AWS::DataSync::Task" -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-imagebuilder-component.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-imagebuilder-component.json deleted file mode 100644 index cba310313f..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-imagebuilder-component.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Version", - "/properties/ChangeDescription", - "/properties/Description", - "/properties/Platform", - "/properties/Data", - "/properties/Uri", - "/properties/KmsKeyId", - "/properties/SupportedOsVersions", - "/properties/Tags" - ], - "oneOf": [ - { - "required": [ - "Data" - ] - }, - { - "required": [ - "Uri" - ] - } - ], - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "ChangeDescription": { - "type": "string" - }, - "Data": { - "maxLength": 16000, - "minLength": 1, - "pattern": "[^\\x00]+", - "type": "string" - }, - "Description": { - "type": "string" - }, - "Encrypted": { - "type": "boolean" - }, - "KmsKeyId": { - "type": "string" - }, - "Name": { - "pattern": "^[-_A-Za-z-0-9][-_A-Za-z0-9 ]{1,126}[-_A-Za-z-0-9]$", - "type": "string" - }, - "Platform": { - "enum": [ - "Windows", - "Linux" - ], - "type": "string" - }, - "SupportedOsVersions": { - "insertionOrder": false, - "items": { - "type": "string" - }, - "type": "array" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - ".{1,}": { - "type": "string" - } - }, - "type": "object" - }, - "Type": { - "enum": [ - "BUILD", - "TEST" - ], - "type": "string" - }, - "Uri": { - "type": "string" - }, - "Version": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Type", - "/properties/Encrypted" - ], - "required": [ - "Name", - "Platform", - "Version" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-imagebuilder", - "tagging": { - "taggable": false - }, - "typeName": "AWS::ImageBuilder::Component", - "writeOnlyProperties": [ - "/properties/Data", - "/properties/Uri", - "/properties/Platform" - ] -} diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-imagebuilder-infrastructureconfiguration.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-imagebuilder-infrastructureconfiguration.json deleted file mode 100644 index 3ea8677c5d..0000000000 --- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-imagebuilder-infrastructureconfiguration.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name" - ], - "definitions": { - "InstanceMetadataOptions": { - "additionalProperties": false, - "properties": { - "HttpPutResponseHopLimit": { - "type": "integer" - }, - "HttpTokens": { - "enum": [ - "required", - "optional" - ], - "type": "string" - } - }, - "type": "object" - }, - "Logging": { - "additionalProperties": false, - "properties": { - "S3Logs": { - "$ref": "#/definitions/S3Logs" - } - }, - "type": "object" - }, - "S3Logs": { - "additionalProperties": false, - "properties": { - "S3BucketName": { - "type": "string" - }, - "S3KeyPrefix": { - "type": "string" - } - }, - "type": "object" - }, - "TagMap": { - "additionalProperties": false, - "properties": { - "TagKey": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "TagValue": { - "maxLength": 256, - "minLength": 1, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Arn" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Description": { - "type": "string" - }, - "InstanceMetadataOptions": { - "$ref": "#/definitions/InstanceMetadataOptions" - }, - "InstanceProfileName": { - "pattern": "^[\\w+=,.@-]+$", - "type": "string" - }, - "InstanceTypes": { - "insertionOrder": true, - "items": { - "type": "string" - }, - "type": "array" - }, - "KeyPair": { - "type": "string" - }, - "Logging": { - "$ref": "#/definitions/Logging" - }, - "Name": { - "pattern": "^[-_A-Za-z-0-9][-_A-Za-z0-9 ]{1,126}[-_A-Za-z-0-9]$", - "type": "string" - }, - "ResourceTags": { - "additionalProperties": false, - "patternProperties": { - ".{1,}": { - "type": "string" - } - }, - "type": "object" - }, - "SecurityGroupIds": { - "format": "AWS::EC2::SecurityGroup.Ids", - "insertionOrder": false, - "items": { - "format": "AWS::EC2::SecurityGroup.GroupId", - "type": "string" - }, - "type": "array" - }, - "SnsTopicArn": { - "pattern": "^arn:aws[^:]*:sns:[^:]+:[0-9]{12}:[a-zA-Z0-9-_]{1,256}$", - "type": "string" - }, - "SubnetId": { - "format": "AWS::EC2::Subnet.Id", - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - ".{1,}": { - "type": "string" - } - }, - "type": "object" - }, - "TerminateInstanceOnFailure": { - "type": "boolean" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "required": [ - "Name", - "InstanceProfileName" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-imagebuilder.git", - "tagging": { - "taggable": false - }, - "typeName": "AWS::ImageBuilder::InfrastructureConfiguration" -} 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 3cc641c2ef..fcfc81ec04 100644 --- a/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py @@ -1088,6 +1088,7 @@ "AWS::WAFv2::RuleGroup", "AWS::WAFv2::WebACL", "AWS::WAFv2::WebACLAssociation", + "AWS::Wisdom::AIAgent", "AWS::Wisdom::AIPrompt", "AWS::Wisdom::AIPromptVersion", "AWS::Wisdom::Assistant", @@ -2169,6 +2170,7 @@ "aws-wafv2-rulegroup.json", "aws-wafv2-webacl.json", "aws-wafv2-webaclassociation.json", + "aws-wisdom-aiagent.json", "aws-wisdom-aiprompt.json", "aws-wisdom-aipromptversion.json", "aws-wisdom-assistant.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 82ec44a8da..49309e9d3a 100644 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py @@ -1125,6 +1125,7 @@ "aws-rds-dbsecuritygroupingress.json", "aws-rds-dbsubnetgroup.json", "aws-rds-eventsubscription.json", + "aws-rds-globalcluster.json", "aws-rds-integration.json", "aws-rds-optiongroup.json", "aws-redshift-cluster.json", @@ -1258,7 +1259,10 @@ "aws-wafregional-sqlinjectionmatchset.json", "aws-wafregional-webaclassociation.json", "aws-wafregional-xssmatchset.json", + "aws-wafv2-ipset.json", "aws-wafv2-loggingconfiguration.json", + "aws-wafv2-regexpatternset.json", + "aws-wafv2-rulegroup.json", "aws-wafv2-webaclassociation.json", "aws-workspaces-workspace.json", "aws-xray-resourcepolicy.json", diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-rds-globalcluster.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-rds-globalcluster.json deleted file mode 100644 index c7d134d12e..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-rds-globalcluster.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/GlobalClusterIdentifier", - "/properties/SourceDBClusterIdentifier", - "/properties/StorageEncrypted", - "/properties/Engine" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "required": [ - "Key" - ], - "type": "object" - } - }, - "oneOf": [ - { - "required": [ - "SourceDBClusterIdentifier" - ] - }, - { - "required": [ - "Engine" - ] - } - ], - "primaryIdentifier": [ - "/properties/GlobalClusterIdentifier" - ], - "properties": { - "DeletionProtection": { - "type": "boolean" - }, - "Engine": { - "enum": [ - "aurora", - "aurora-mysql", - "aurora-postgresql" - ], - "type": "string" - }, - "EngineLifecycleSupport": { - "type": "string" - }, - "EngineVersion": { - "type": "string" - }, - "GlobalClusterIdentifier": { - "maxLength": 63, - "minLength": 1, - "pattern": "^[a-zA-Z]{1}(?:-?[a-zA-Z0-9]){0,62}$", - "type": "string" - }, - "SourceDBClusterIdentifier": { - "oneOf": [ - { - "pattern": "^[a-zA-Z]{1}(?:-?[a-zA-Z0-9]){0,62}$" - }, - { - "pattern": "^(?=.{40,128}$)arn.*" - } - ], - "type": "string" - }, - "StorageEncrypted": { - "type": "boolean" - }, - "Tags": { - "insertionOrder": false, - "items": { - "$ref": "#/definitions/Tag" - }, - "maxItems": 50, - "type": "array", - "uniqueItems": true - } - }, - "propertyTransform": { - "/properties/GlobalClusterIdentifier": "$lowercase(GlobalClusterIdentifier)" - }, - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-rds", - "typeName": "AWS::RDS::GlobalCluster" -} diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-ipset.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-ipset.json deleted file mode 100644 index 65b6b7ad16..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-ipset.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Scope" - ], - "definitions": { - "EntityDescription": { - "pattern": "^[a-zA-Z0-9=:#@/\\-,.][a-zA-Z0-9+=:#@/\\-,.\\s]+[a-zA-Z0-9+=:#@/\\-,.]{1,256}$", - "type": "string" - }, - "EntityId": { - "pattern": "^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$", - "type": "string" - }, - "EntityName": { - "pattern": "^[0-9A-Za-z_-]{1,128}$", - "type": "string" - }, - "IPAddress": { - "maxLength": 50, - "minLength": 1, - "type": "string" - }, - "IPAddressVersion": { - "enum": [ - "IPV4", - "IPV6" - ], - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "Scope": { - "enum": [ - "CLOUDFRONT", - "REGIONAL" - ], - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name", - "/properties/Id", - "/properties/Scope" - ], - "properties": { - "Addresses": { - "items": { - "$ref": "#/definitions/IPAddress" - }, - "type": "array" - }, - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "Description": { - "$ref": "#/definitions/EntityDescription" - }, - "IPAddressVersion": { - "$ref": "#/definitions/IPAddressVersion" - }, - "Id": { - "$ref": "#/definitions/EntityId" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Scope": { - "$ref": "#/definitions/Scope" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id" - ], - "required": [ - "Addresses", - "IPAddressVersion", - "Scope" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-wafv2.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::WAFv2::IPSet" -} diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-regexpatternset.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-regexpatternset.json deleted file mode 100644 index 246565624d..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-regexpatternset.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Scope" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name", - "/properties/Id", - "/properties/Scope" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Description": { - "pattern": "^[a-zA-Z0-9=:#@/\\-,.][a-zA-Z0-9+=:#@/\\-,.\\s]+[a-zA-Z0-9+=:#@/\\-,.]{1,256}$", - "type": "string" - }, - "Id": { - "pattern": "^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$", - "type": "string" - }, - "Name": { - "pattern": "^[0-9A-Za-z_-]{1,128}$", - "type": "string" - }, - "RegularExpressionList": { - "items": { - "maxLength": 200, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "Scope": { - "enum": [ - "CLOUDFRONT", - "REGIONAL" - ], - "type": "string" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id" - ], - "required": [ - "Scope", - "RegularExpressionList" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-wafv2.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::WAFv2::RegexPatternSet" -} diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-rulegroup.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-rulegroup.json deleted file mode 100644 index 57513d62ae..0000000000 --- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-wafv2-rulegroup.json +++ /dev/null @@ -1,1379 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Scope" - ], - "definitions": { - "AllowAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "AndStatement": { - "additionalProperties": false, - "properties": { - "Statements": { - "items": { - "$ref": "#/definitions/Statement" - }, - "type": "array" - } - }, - "required": [ - "Statements" - ], - "type": "object" - }, - "BlockAction": { - "additionalProperties": false, - "properties": { - "CustomResponse": { - "$ref": "#/definitions/CustomResponse" - } - }, - "type": "object" - }, - "Body": { - "additionalProperties": false, - "properties": { - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "type": "object" - }, - "BodyParsingFallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH", - "EVALUATE_AS_STRING" - ], - "type": "string" - }, - "ByteMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "PositionalConstraint": { - "$ref": "#/definitions/PositionalConstraint" - }, - "SearchString": { - "$ref": "#/definitions/SearchString" - }, - "SearchStringBase64": { - "$ref": "#/definitions/SearchStringBase64" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "PositionalConstraint", - "TextTransformations" - ], - "type": "object" - }, - "CaptchaAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "CaptchaConfig": { - "additionalProperties": false, - "properties": { - "ImmunityTimeProperty": { - "$ref": "#/definitions/ImmunityTimeProperty" - } - }, - "type": "object" - }, - "ChallengeAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "ChallengeConfig": { - "additionalProperties": false, - "properties": { - "ImmunityTimeProperty": { - "$ref": "#/definitions/ImmunityTimeProperty" - } - }, - "type": "object" - }, - "CookieMatchPattern": { - "additionalProperties": false, - "properties": { - "All": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "ExcludedCookies": { - "items": { - "maxLength": 60, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - }, - "IncludedCookies": { - "items": { - "maxLength": 60, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - } - }, - "type": "object" - }, - "Cookies": { - "additionalProperties": false, - "properties": { - "MatchPattern": { - "$ref": "#/definitions/CookieMatchPattern" - }, - "MatchScope": { - "$ref": "#/definitions/MapMatchScope" - }, - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "required": [ - "MatchPattern", - "MatchScope", - "OversizeHandling" - ], - "type": "object" - }, - "CountAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "CustomHTTPHeader": { - "additionalProperties": false, - "properties": { - "Name": { - "$ref": "#/definitions/CustomHTTPHeaderName" - }, - "Value": { - "$ref": "#/definitions/CustomHTTPHeaderValue" - } - }, - "required": [ - "Name", - "Value" - ], - "type": "object" - }, - "CustomHTTPHeaderName": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "CustomHTTPHeaderValue": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "CustomRequestHandling": { - "additionalProperties": false, - "properties": { - "InsertHeaders": { - "items": { - "$ref": "#/definitions/CustomHTTPHeader" - }, - "minItems": 1, - "type": "array" - } - }, - "required": [ - "InsertHeaders" - ], - "type": "object" - }, - "CustomResponse": { - "additionalProperties": false, - "properties": { - "CustomResponseBodyKey": { - "pattern": "^[\\w\\-]+$", - "type": "string" - }, - "ResponseCode": { - "$ref": "#/definitions/ResponseStatusCode" - }, - "ResponseHeaders": { - "items": { - "$ref": "#/definitions/CustomHTTPHeader" - }, - "minItems": 1, - "type": "array" - } - }, - "required": [ - "ResponseCode" - ], - "type": "object" - }, - "CustomResponseBodies": { - "additionalProperties": false, - "minProperties": 1, - "patternProperties": { - "^[\\w\\-]+$": { - "$ref": "#/definitions/CustomResponseBody" - } - }, - "type": "object" - }, - "CustomResponseBody": { - "additionalProperties": false, - "properties": { - "Content": { - "$ref": "#/definitions/ResponseContent" - }, - "ContentType": { - "$ref": "#/definitions/ResponseContentType" - } - }, - "required": [ - "ContentType", - "Content" - ], - "type": "object" - }, - "EntityDescription": { - "pattern": "^[a-zA-Z0-9=:#@/\\-,.][a-zA-Z0-9+=:#@/\\-,.\\s]+[a-zA-Z0-9+=:#@/\\-,.]{1,256}$", - "type": "string" - }, - "EntityId": { - "pattern": "^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$", - "type": "string" - }, - "EntityName": { - "pattern": "^[0-9A-Za-z_-]{1,128}$", - "type": "string" - }, - "EvaluationWindowSec": { - "enum": [ - 60, - 120, - 300, - 600 - ], - "type": "integer" - }, - "FieldToMatch": { - "additionalProperties": false, - "properties": { - "AllQueryArguments": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "Body": { - "$ref": "#/definitions/Body" - }, - "Cookies": { - "$ref": "#/definitions/Cookies" - }, - "Headers": { - "$ref": "#/definitions/Headers" - }, - "JA3Fingerprint": { - "$ref": "#/definitions/JA3Fingerprint" - }, - "JsonBody": { - "$ref": "#/definitions/JsonBody" - }, - "Method": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "QueryString": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "SingleHeader": { - "additionalProperties": false, - "properties": { - "Name": { - "type": "string" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "SingleQueryArgument": { - "additionalProperties": false, - "properties": { - "Name": { - "type": "string" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "UriPath": { - "format": "json", - "type": [ - "object", - "string" - ] - } - }, - "type": "object" - }, - "ForwardedIPConfiguration": { - "additionalProperties": false, - "properties": { - "FallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH" - ], - "type": "string" - }, - "HeaderName": { - "pattern": "^[a-zA-Z0-9-]{1,255}$", - "type": "string" - } - }, - "required": [ - "HeaderName", - "FallbackBehavior" - ], - "type": "object" - }, - "GeoMatchStatement": { - "additionalProperties": false, - "properties": { - "CountryCodes": { - "items": { - "maxLength": 2, - "minLength": 1, - "type": "string" - }, - "type": "array" - }, - "ForwardedIPConfig": { - "$ref": "#/definitions/ForwardedIPConfiguration" - } - }, - "type": "object" - }, - "HeaderMatchPattern": { - "additionalProperties": false, - "properties": { - "All": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "ExcludedHeaders": { - "items": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - }, - "IncludedHeaders": { - "items": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - } - }, - "type": "object" - }, - "Headers": { - "additionalProperties": false, - "properties": { - "MatchPattern": { - "$ref": "#/definitions/HeaderMatchPattern" - }, - "MatchScope": { - "$ref": "#/definitions/MapMatchScope" - }, - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "required": [ - "MatchPattern", - "MatchScope", - "OversizeHandling" - ], - "type": "object" - }, - "IPSetForwardedIPConfiguration": { - "additionalProperties": false, - "properties": { - "FallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH" - ], - "type": "string" - }, - "HeaderName": { - "pattern": "^[a-zA-Z0-9-]{1,255}$", - "type": "string" - }, - "Position": { - "enum": [ - "FIRST", - "LAST", - "ANY" - ], - "type": "string" - } - }, - "required": [ - "HeaderName", - "FallbackBehavior", - "Position" - ], - "type": "object" - }, - "IPSetReferenceStatement": { - "additionalProperties": false, - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "IPSetForwardedIPConfig": { - "$ref": "#/definitions/IPSetForwardedIPConfiguration" - } - }, - "required": [ - "Arn" - ], - "type": "object" - }, - "ImmunityTimeProperty": { - "additionalProperties": false, - "properties": { - "ImmunityTime": { - "maximum": 259200, - "minimum": 60, - "type": "integer" - } - }, - "required": [ - "ImmunityTime" - ], - "type": "object" - }, - "JA3Fingerprint": { - "additionalProperties": false, - "properties": { - "FallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH" - ], - "type": "string" - } - }, - "required": [ - "FallbackBehavior" - ], - "type": "object" - }, - "JsonBody": { - "additionalProperties": false, - "properties": { - "InvalidFallbackBehavior": { - "$ref": "#/definitions/BodyParsingFallbackBehavior" - }, - "MatchPattern": { - "$ref": "#/definitions/JsonMatchPattern" - }, - "MatchScope": { - "$ref": "#/definitions/JsonMatchScope" - }, - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "required": [ - "MatchPattern", - "MatchScope" - ], - "type": "object" - }, - "JsonMatchPattern": { - "additionalProperties": false, - "properties": { - "All": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "IncludedPaths": { - "items": { - "$ref": "#/definitions/JsonPointerPath" - }, - "type": "array" - } - }, - "type": "object" - }, - "JsonMatchScope": { - "enum": [ - "ALL", - "KEY", - "VALUE" - ], - "type": "string" - }, - "JsonPointerPath": { - "pattern": "^[\\/]+([^~]*(~[01])*){1,512}$", - "type": "string" - }, - "Label": { - "additionalProperties": false, - "properties": { - "Name": { - "$ref": "#/definitions/LabelName" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "LabelMatchKey": { - "pattern": "^[0-9A-Za-z_:-]{1,1024}$", - "type": "string" - }, - "LabelMatchScope": { - "enum": [ - "LABEL", - "NAMESPACE" - ], - "type": "string" - }, - "LabelMatchStatement": { - "additionalProperties": false, - "properties": { - "Key": { - "$ref": "#/definitions/LabelMatchKey" - }, - "Scope": { - "$ref": "#/definitions/LabelMatchScope" - } - }, - "required": [ - "Scope", - "Key" - ], - "type": "object" - }, - "LabelName": { - "pattern": "^[0-9A-Za-z_:-]{1,1024}$", - "type": "string" - }, - "LabelSummary": { - "additionalProperties": false, - "properties": { - "Name": { - "$ref": "#/definitions/LabelName" - } - }, - "type": "object" - }, - "MapMatchScope": { - "enum": [ - "ALL", - "KEY", - "VALUE" - ], - "type": "string" - }, - "NotStatement": { - "additionalProperties": false, - "properties": { - "Statement": { - "$ref": "#/definitions/Statement" - } - }, - "required": [ - "Statement" - ], - "type": "object" - }, - "OrStatement": { - "additionalProperties": false, - "properties": { - "Statements": { - "items": { - "$ref": "#/definitions/Statement" - }, - "type": "array" - } - }, - "required": [ - "Statements" - ], - "type": "object" - }, - "OversizeHandling": { - "enum": [ - "CONTINUE", - "MATCH", - "NO_MATCH" - ], - "type": "string" - }, - "PositionalConstraint": { - "enum": [ - "EXACTLY", - "STARTS_WITH", - "ENDS_WITH", - "CONTAINS", - "CONTAINS_WORD" - ], - "type": "string" - }, - "RateBasedStatement": { - "additionalProperties": false, - "properties": { - "AggregateKeyType": { - "enum": [ - "IP", - "FORWARDED_IP", - "CONSTANT", - "CUSTOM_KEYS" - ], - "type": "string" - }, - "CustomKeys": { - "items": { - "$ref": "#/definitions/RateBasedStatementCustomKey" - }, - "maxItems": 5, - "type": "array" - }, - "EvaluationWindowSec": { - "$ref": "#/definitions/EvaluationWindowSec" - }, - "ForwardedIPConfig": { - "$ref": "#/definitions/ForwardedIPConfiguration" - }, - "Limit": { - "$ref": "#/definitions/RateLimit" - }, - "ScopeDownStatement": { - "$ref": "#/definitions/Statement" - } - }, - "required": [ - "Limit", - "AggregateKeyType" - ], - "type": "object" - }, - "RateBasedStatementCustomKey": { - "additionalProperties": false, - "properties": { - "Cookie": { - "$ref": "#/definitions/RateLimitCookie" - }, - "ForwardedIP": { - "$ref": "#/definitions/RateLimitForwardedIP" - }, - "HTTPMethod": { - "$ref": "#/definitions/RateLimitHTTPMethod" - }, - "Header": { - "$ref": "#/definitions/RateLimitHeader" - }, - "IP": { - "$ref": "#/definitions/RateLimitIP" - }, - "LabelNamespace": { - "$ref": "#/definitions/RateLimitLabelNamespace" - }, - "QueryArgument": { - "$ref": "#/definitions/RateLimitQueryArgument" - }, - "QueryString": { - "$ref": "#/definitions/RateLimitQueryString" - }, - "UriPath": { - "$ref": "#/definitions/RateLimitUriPath" - } - }, - "type": "object" - }, - "RateLimit": { - "maximum": 2000000000, - "minimum": 100, - "type": "integer" - }, - "RateLimitCookie": { - "additionalProperties": false, - "properties": { - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Name", - "TextTransformations" - ], - "type": "object" - }, - "RateLimitForwardedIP": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RateLimitHTTPMethod": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RateLimitHeader": { - "additionalProperties": false, - "properties": { - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Name", - "TextTransformations" - ], - "type": "object" - }, - "RateLimitIP": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RateLimitLabelNamespace": { - "additionalProperties": false, - "properties": { - "Namespace": { - "pattern": "^[0-9A-Za-z_:-]{1,1024}$", - "type": "string" - } - }, - "required": [ - "Namespace" - ], - "type": "object" - }, - "RateLimitQueryArgument": { - "additionalProperties": false, - "properties": { - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Name", - "TextTransformations" - ], - "type": "object" - }, - "RateLimitQueryString": { - "additionalProperties": false, - "properties": { - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "TextTransformations" - ], - "type": "object" - }, - "RateLimitUriPath": { - "additionalProperties": false, - "properties": { - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "TextTransformations" - ], - "type": "object" - }, - "RegexMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "RegexString": { - "maxLength": 512, - "minLength": 1, - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "RegexString", - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - }, - "RegexPatternSetReferenceStatement": { - "additionalProperties": false, - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Arn", - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - }, - "ResourceArn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "ResponseContent": { - "maxLength": 10240, - "minLength": 1, - "type": "string" - }, - "ResponseContentType": { - "enum": [ - "TEXT_PLAIN", - "TEXT_HTML", - "APPLICATION_JSON" - ], - "type": "string" - }, - "ResponseStatusCode": { - "maximum": 599, - "minimum": 200, - "type": "integer" - }, - "Rule": { - "additionalProperties": false, - "properties": { - "Action": { - "$ref": "#/definitions/RuleAction" - }, - "CaptchaConfig": { - "$ref": "#/definitions/CaptchaConfig" - }, - "ChallengeConfig": { - "$ref": "#/definitions/ChallengeConfig" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Priority": { - "$ref": "#/definitions/RulePriority" - }, - "RuleLabels": { - "items": { - "$ref": "#/definitions/Label" - }, - "type": "array" - }, - "Statement": { - "$ref": "#/definitions/Statement" - }, - "VisibilityConfig": { - "$ref": "#/definitions/VisibilityConfig" - } - }, - "required": [ - "Name", - "Priority", - "Statement", - "VisibilityConfig" - ], - "type": "object" - }, - "RuleAction": { - "additionalProperties": false, - "properties": { - "Allow": { - "$ref": "#/definitions/AllowAction" - }, - "Block": { - "$ref": "#/definitions/BlockAction" - }, - "Captcha": { - "$ref": "#/definitions/CaptchaAction" - }, - "Challenge": { - "$ref": "#/definitions/ChallengeAction" - }, - "Count": { - "$ref": "#/definitions/CountAction" - } - }, - "type": "object" - }, - "RuleGroup": { - "additionalProperties": false, - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "Capacity": { - "minimum": 0, - "type": "integer" - }, - "Description": { - "$ref": "#/definitions/EntityDescription" - }, - "Id": { - "$ref": "#/definitions/EntityId" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Rules": { - "items": { - "$ref": "#/definitions/Rule" - }, - "type": "array" - }, - "VisibilityConfig": { - "$ref": "#/definitions/VisibilityConfig" - } - }, - "type": "object" - }, - "RulePriority": { - "minimum": 0, - "type": "integer" - }, - "Scope": { - "enum": [ - "CLOUDFRONT", - "REGIONAL" - ], - "type": "string" - }, - "SearchString": { - "type": "string" - }, - "SearchStringBase64": { - "type": "string" - }, - "SensitivityLevel": { - "enum": [ - "LOW", - "HIGH" - ], - "type": "string" - }, - "SizeConstraintStatement": { - "additionalProperties": false, - "properties": { - "ComparisonOperator": { - "enum": [ - "EQ", - "NE", - "LE", - "LT", - "GE", - "GT" - ], - "type": "string" - }, - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "Size": { - "maximum": 21474836480, - "minimum": 0, - "type": "number" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "ComparisonOperator", - "Size", - "TextTransformations" - ], - "type": "object" - }, - "SqliMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "SensitivityLevel": { - "$ref": "#/definitions/SensitivityLevel" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - }, - "Statement": { - "additionalProperties": false, - "properties": { - "AndStatement": { - "$ref": "#/definitions/AndStatement" - }, - "ByteMatchStatement": { - "$ref": "#/definitions/ByteMatchStatement" - }, - "GeoMatchStatement": { - "$ref": "#/definitions/GeoMatchStatement" - }, - "IPSetReferenceStatement": { - "$ref": "#/definitions/IPSetReferenceStatement" - }, - "LabelMatchStatement": { - "$ref": "#/definitions/LabelMatchStatement" - }, - "NotStatement": { - "$ref": "#/definitions/NotStatement" - }, - "OrStatement": { - "$ref": "#/definitions/OrStatement" - }, - "RateBasedStatement": { - "$ref": "#/definitions/RateBasedStatement" - }, - "RegexMatchStatement": { - "$ref": "#/definitions/RegexMatchStatement" - }, - "RegexPatternSetReferenceStatement": { - "$ref": "#/definitions/RegexPatternSetReferenceStatement" - }, - "SizeConstraintStatement": { - "$ref": "#/definitions/SizeConstraintStatement" - }, - "SqliMatchStatement": { - "$ref": "#/definitions/SqliMatchStatement" - }, - "XssMatchStatement": { - "$ref": "#/definitions/XssMatchStatement" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "TextTransformation": { - "additionalProperties": false, - "properties": { - "Priority": { - "$ref": "#/definitions/TextTransformationPriority" - }, - "Type": { - "$ref": "#/definitions/TextTransformationType" - } - }, - "required": [ - "Priority", - "Type" - ], - "type": "object" - }, - "TextTransformationPriority": { - "minimum": 0, - "type": "integer" - }, - "TextTransformationType": { - "enum": [ - "NONE", - "COMPRESS_WHITE_SPACE", - "HTML_ENTITY_DECODE", - "LOWERCASE", - "CMD_LINE", - "URL_DECODE", - "BASE64_DECODE", - "HEX_DECODE", - "MD5", - "REPLACE_COMMENTS", - "ESCAPE_SEQ_DECODE", - "SQL_HEX_DECODE", - "CSS_DECODE", - "JS_DECODE", - "NORMALIZE_PATH", - "NORMALIZE_PATH_WIN", - "REMOVE_NULLS", - "REPLACE_NULLS", - "BASE64_DECODE_EXT", - "URL_DECODE_UNI", - "UTF8_TO_UNICODE" - ], - "type": "string" - }, - "VisibilityConfig": { - "additionalProperties": false, - "properties": { - "CloudWatchMetricsEnabled": { - "type": "boolean" - }, - "MetricName": { - "maxLength": 128, - "minLength": 1, - "pattern": "^[\\w#:\\.\\-/]+$", - "type": "string" - }, - "SampledRequestsEnabled": { - "type": "boolean" - } - }, - "required": [ - "SampledRequestsEnabled", - "CloudWatchMetricsEnabled", - "MetricName" - ], - "type": "object" - }, - "XssMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name", - "/properties/Id", - "/properties/Scope" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "AvailableLabels": { - "items": { - "$ref": "#/definitions/LabelSummary" - }, - "type": "array" - }, - "Capacity": { - "minimum": 0, - "type": "integer" - }, - "ConsumedLabels": { - "items": { - "$ref": "#/definitions/LabelSummary" - }, - "type": "array" - }, - "CustomResponseBodies": { - "$ref": "#/definitions/CustomResponseBodies" - }, - "Description": { - "$ref": "#/definitions/EntityDescription" - }, - "Id": { - "$ref": "#/definitions/EntityId" - }, - "LabelNamespace": { - "$ref": "#/definitions/LabelName" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Rules": { - "items": { - "$ref": "#/definitions/Rule" - }, - "type": "array" - }, - "Scope": { - "$ref": "#/definitions/Scope" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "minItems": 1, - "type": "array" - }, - "VisibilityConfig": { - "$ref": "#/definitions/VisibilityConfig" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id", - "/properties/LabelNamespace", - "/properties/AvailableLabels/*/Name", - "/properties/ConsumedLabels/*/Name" - ], - "required": [ - "Capacity", - "Scope", - "VisibilityConfig" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-wafv2.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::WAFv2::RuleGroup" -} 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 11f77bba24..9273a75870 100644 --- a/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py @@ -1486,7 +1486,6 @@ "aws-codedeploy-application.json", "aws-codedeploy-deploymentconfig.json", "aws-codedeploy-deploymentgroup.json", - "aws-codeguruprofiler-profilinggroup.json", "aws-codegurureviewer-repositoryassociation.json", "aws-codepipeline-customactiontype.json", "aws-codepipeline-pipeline.json", @@ -2134,7 +2133,6 @@ "aws-networkmanager-transitgatewayregistration.json", "aws-networkmanager-transitgatewayroutetableattachment.json", "aws-networkmanager-vpcattachment.json", - "aws-nimblestudio-studio.json", "aws-oam-link.json", "aws-oam-sink.json", "aws-opensearchserverless-accesspolicy.json", @@ -2490,6 +2488,7 @@ "aws-wafv2-webacl.json", "aws-wafv2-webaclassociation.json", "aws-wisdom-aiagent.json", + "aws-wisdom-aiagentversion.json", "aws-wisdom-aiprompt.json", "aws-wisdom-aipromptversion.json", "aws-wisdom-assistant.json", diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-codeguruprofiler-profilinggroup.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-codeguruprofiler-profilinggroup.json new file mode 100644 index 0000000000..3cabd6bb47 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-codeguruprofiler-profilinggroup.json @@ -0,0 +1,127 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/ProfilingGroupName", + "/properties/ComputePlatform" + ], + "definitions": { + "Channel": { + "properties": { + "channelId": { + "$ref": "#/definitions/ChannelId" + }, + "channelUri": { + "$ref": "#/definitions/ChannelUri" + } + }, + "required": [ + "channelUri" + ], + "type": "object" + }, + "ChannelId": { + "pattern": "[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}", + "type": "string" + }, + "ChannelUri": { + "pattern": "^arn:aws([-\\w]*):[a-z-]+:(([a-z]+-)+[0-9]+)?:([0-9]{12}):[^.]+$", + "type": "string" + }, + "IamArn": { + "pattern": "^arn:aws([-\\w]*):iam::([0-9]{12}):[\\S]+$", + "type": "string" + }, + "ProfilingGroupArn": { + "pattern": "^arn:aws([-\\w]*):codeguru-profiler:(([a-z]+-)+[0-9]+):([0-9]{12}):profilingGroup/[^.]+$", + "type": "string" + }, + "Tag": { + "additionalProperties": false, + "properties": { + "Key": { + "maxLength": 128, + "minLength": 1, + "type": "string" + }, + "Value": { + "maxLength": 256, + "minLength": 0, + "type": "string" + } + }, + "required": [ + "Value", + "Key" + ], + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/ProfilingGroupName" + ], + "properties": { + "AgentPermissions": { + "additionalProperties": false, + "properties": { + "Principals": { + "items": { + "$ref": "#/definitions/IamArn" + }, + "type": "array" + } + }, + "required": [ + "Principals" + ], + "type": "object" + }, + "AnomalyDetectionNotificationConfiguration": { + "items": { + "$ref": "#/definitions/Channel" + }, + "type": "array" + }, + "Arn": { + "$ref": "#/definitions/ProfilingGroupArn", + "examples": [ + "arn:aws:codeguru-profiler:us-east-1:000000000000:profilingGroup/My-example-profiling-group" + ] + }, + "ComputePlatform": { + "enum": [ + "Default", + "AWSLambda" + ], + "type": "string" + }, + "ProfilingGroupName": { + "maxLength": 255, + "minLength": 1, + "pattern": "^[\\w-]+$", + "type": "string" + }, + "Tags": { + "items": { + "$ref": "#/definitions/Tag" + }, + "maxItems": 50, + "type": "array", + "uniqueItems": true + } + }, + "readOnlyProperties": [ + "/properties/Arn" + ], + "required": [ + "ProfilingGroupName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-codeguru-profiler", + "tagging": { + "cloudFormationSystemTags": true, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::CodeGuruProfiler::ProfilingGroup" +} diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-nimblestudio-studio.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-nimblestudio-studio.json new file mode 100644 index 0000000000..bd6fcbeb38 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-nimblestudio-studio.json @@ -0,0 +1,99 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/StudioName", + "/properties/Tags" + ], + "definitions": { + "StudioEncryptionConfiguration": { + "additionalProperties": false, + "properties": { + "KeyArn": { + "minLength": 4, + "pattern": "^arn:.*", + "type": "string" + }, + "KeyType": { + "$ref": "#/definitions/StudioEncryptionConfigurationKeyType" + } + }, + "required": [ + "KeyType" + ], + "type": "object" + }, + "StudioEncryptionConfigurationKeyType": { + "enum": [ + "AWS_OWNED_KEY", + "CUSTOMER_MANAGED_KEY" + ], + "type": "string" + }, + "Tags": { + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + }, + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/StudioId" + ], + "properties": { + "AdminRoleArn": { + "type": "string" + }, + "DisplayName": { + "maxLength": 64, + "minLength": 0, + "type": "string" + }, + "HomeRegion": { + "maxLength": 50, + "minLength": 0, + "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]", + "type": "string" + }, + "SsoClientId": { + "type": "string" + }, + "StudioEncryptionConfiguration": { + "$ref": "#/definitions/StudioEncryptionConfiguration" + }, + "StudioId": { + "type": "string" + }, + "StudioName": { + "maxLength": 64, + "minLength": 3, + "pattern": "^[a-z0-9]*$", + "type": "string" + }, + "StudioUrl": { + "type": "string" + }, + "Tags": { + "$ref": "#/definitions/Tags" + }, + "UserRoleArn": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/HomeRegion", + "/properties/SsoClientId", + "/properties/StudioId", + "/properties/StudioUrl" + ], + "required": [ + "DisplayName", + "UserRoleArn", + "AdminRoleArn", + "StudioName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", + "typeName": "AWS::NimbleStudio::Studio" +} 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 e7f6cc0bc0..7f6ed6ba43 100644 --- a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py @@ -1664,7 +1664,6 @@ "aws-networkmanager-transitgatewayregistration.json", "aws-networkmanager-transitgatewayroutetableattachment.json", "aws-networkmanager-vpcattachment.json", - "aws-nimblestudio-studio.json", "aws-oam-link.json", "aws-oam-sink.json", "aws-opensearchservice-domain.json", @@ -1849,6 +1848,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", diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-nimblestudio-studio.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-nimblestudio-studio.json new file mode 100644 index 0000000000..bd6fcbeb38 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_north_1/aws-nimblestudio-studio.json @@ -0,0 +1,99 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/StudioName", + "/properties/Tags" + ], + "definitions": { + "StudioEncryptionConfiguration": { + "additionalProperties": false, + "properties": { + "KeyArn": { + "minLength": 4, + "pattern": "^arn:.*", + "type": "string" + }, + "KeyType": { + "$ref": "#/definitions/StudioEncryptionConfigurationKeyType" + } + }, + "required": [ + "KeyType" + ], + "type": "object" + }, + "StudioEncryptionConfigurationKeyType": { + "enum": [ + "AWS_OWNED_KEY", + "CUSTOMER_MANAGED_KEY" + ], + "type": "string" + }, + "Tags": { + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + }, + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/StudioId" + ], + "properties": { + "AdminRoleArn": { + "type": "string" + }, + "DisplayName": { + "maxLength": 64, + "minLength": 0, + "type": "string" + }, + "HomeRegion": { + "maxLength": 50, + "minLength": 0, + "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]", + "type": "string" + }, + "SsoClientId": { + "type": "string" + }, + "StudioEncryptionConfiguration": { + "$ref": "#/definitions/StudioEncryptionConfiguration" + }, + "StudioId": { + "type": "string" + }, + "StudioName": { + "maxLength": 64, + "minLength": 3, + "pattern": "^[a-z0-9]*$", + "type": "string" + }, + "StudioUrl": { + "type": "string" + }, + "Tags": { + "$ref": "#/definitions/Tags" + }, + "UserRoleArn": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/HomeRegion", + "/properties/SsoClientId", + "/properties/StudioId", + "/properties/StudioUrl" + ], + "required": [ + "DisplayName", + "UserRoleArn", + "AdminRoleArn", + "StudioName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", + "typeName": "AWS::NimbleStudio::Studio" +} 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 94e600b9cd..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ses-configurationset.json +++ /dev/null @@ -1,133 +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": { - "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_south_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py index d663fc38f8..db31e78cb0 100644 --- a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py @@ -539,6 +539,7 @@ "AWS::Redshift::ScheduledAction", "AWS::RedshiftServerless::Namespace", "AWS::RedshiftServerless::Workgroup", + "AWS::Rekognition::Collection", "AWS::ResourceExplorer2::DefaultViewAssociation", "AWS::ResourceExplorer2::Index", "AWS::ResourceExplorer2::View", @@ -1184,6 +1185,7 @@ "aws-redshift-scheduledaction.json", "aws-redshiftserverless-namespace.json", "aws-redshiftserverless-workgroup.json", + "aws-rekognition-collection.json", "aws-resourceexplorer2-defaultviewassociation.json", "aws-resourceexplorer2-index.json", "aws-resourceexplorer2-view.json", 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 6b12c841f0..cfc82e2991 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py @@ -1381,14 +1381,10 @@ "aws-bedrock-agentalias.json", "aws-bedrock-applicationinferenceprofile.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-budgets-budget.json", "aws-budgets-budgetsaction.json", "aws-cassandra-keyspace.json", @@ -2100,7 +2096,6 @@ "aws-networkmanager-transitgatewayregistration.json", "aws-networkmanager-transitgatewayroutetableattachment.json", "aws-networkmanager-vpcattachment.json", - "aws-nimblestudio-studio.json", "aws-oam-link.json", "aws-oam-sink.json", "aws-opensearchserverless-accesspolicy.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-flow.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-flow.json new file mode 100644 index 0000000000..3154ba0a39 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-flow.json @@ -0,0 +1,984 @@ +{ + "additionalIdentifiers": [ + [ + "/properties/Id" + ] + ], + "additionalProperties": false, + "definitions": { + "AgentFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "AgentAliasArn": { + "maxLength": 2048, + "pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent-alias/[0-9a-zA-Z]{10}/[0-9a-zA-Z]{10}$", + "type": "string" + } + }, + "required": [ + "AgentAliasArn" + ], + "type": "object" + }, + "CollectorFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "ConditionFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "Conditions": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowCondition" + }, + "maxItems": 5, + "minItems": 1, + "type": "array" + } + }, + "required": [ + "Conditions" + ], + "type": "object" + }, + "DefinitionSubstitutions": { + "additionalProperties": false, + "maxProperties": 500, + "minProperties": 1, + "patternProperties": { + "^[a-zA-Z0-9]+$": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "integer" + }, + { + "type": "boolean" + } + ] + } + }, + "type": "object" + }, + "FlowCondition": { + "additionalProperties": false, + "properties": { + "Expression": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + } + }, + "required": [ + "Name" + ], + "type": "object" + }, + "FlowConditionalConnectionConfiguration": { + "additionalProperties": false, + "properties": { + "Condition": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + } + }, + "required": [ + "Condition" + ], + "type": "object" + }, + "FlowConnection": { + "additionalProperties": false, + "properties": { + "Configuration": { + "$ref": "#/definitions/FlowConnectionConfiguration" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,100}$", + "type": "string" + }, + "Source": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Target": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Type": { + "$ref": "#/definitions/FlowConnectionType" + } + }, + "required": [ + "Name", + "Source", + "Target", + "Type" + ], + "type": "object" + }, + "FlowConnectionConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "Data": { + "$ref": "#/definitions/FlowDataConnectionConfiguration" + } + }, + "required": [ + "Data" + ], + "title": "Data", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Conditional": { + "$ref": "#/definitions/FlowConditionalConnectionConfiguration" + } + }, + "required": [ + "Conditional" + ], + "title": "Conditional", + "type": "object" + } + ] + }, + "FlowConnectionType": { + "enum": [ + "Data", + "Conditional" + ], + "type": "string" + }, + "FlowDataConnectionConfiguration": { + "additionalProperties": false, + "properties": { + "SourceOutput": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "TargetInput": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + } + }, + "required": [ + "SourceOutput", + "TargetInput" + ], + "type": "object" + }, + "FlowDefinition": { + "additionalProperties": false, + "properties": { + "Connections": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowConnection" + }, + "maxItems": 20, + "type": "array" + }, + "Nodes": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowNode" + }, + "maxItems": 20, + "type": "array" + } + }, + "type": "object" + }, + "FlowNode": { + "additionalProperties": false, + "properties": { + "Configuration": { + "$ref": "#/definitions/FlowNodeConfiguration" + }, + "Inputs": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowNodeInput" + }, + "maxItems": 5, + "type": "array" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Outputs": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowNodeOutput" + }, + "maxItems": 5, + "type": "array" + }, + "Type": { + "$ref": "#/definitions/FlowNodeType" + } + }, + "required": [ + "Name", + "Type" + ], + "type": "object" + }, + "FlowNodeConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "Input": { + "$ref": "#/definitions/InputFlowNodeConfiguration" + } + }, + "required": [ + "Input" + ], + "title": "Input", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Output": { + "$ref": "#/definitions/OutputFlowNodeConfiguration" + } + }, + "required": [ + "Output" + ], + "title": "Output", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "KnowledgeBase": { + "$ref": "#/definitions/KnowledgeBaseFlowNodeConfiguration" + } + }, + "required": [ + "KnowledgeBase" + ], + "title": "KnowledgeBase", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Condition": { + "$ref": "#/definitions/ConditionFlowNodeConfiguration" + } + }, + "required": [ + "Condition" + ], + "title": "Condition", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Lex": { + "$ref": "#/definitions/LexFlowNodeConfiguration" + } + }, + "required": [ + "Lex" + ], + "title": "Lex", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Prompt": { + "$ref": "#/definitions/PromptFlowNodeConfiguration" + } + }, + "required": [ + "Prompt" + ], + "title": "Prompt", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "LambdaFunction": { + "$ref": "#/definitions/LambdaFunctionFlowNodeConfiguration" + } + }, + "required": [ + "LambdaFunction" + ], + "title": "LambdaFunction", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Agent": { + "$ref": "#/definitions/AgentFlowNodeConfiguration" + } + }, + "required": [ + "Agent" + ], + "title": "Agent", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Storage": { + "$ref": "#/definitions/StorageFlowNodeConfiguration" + } + }, + "required": [ + "Storage" + ], + "title": "Storage", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Iterator": { + "$ref": "#/definitions/IteratorFlowNodeConfiguration" + } + }, + "required": [ + "Iterator" + ], + "title": "Iterator", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Collector": { + "$ref": "#/definitions/CollectorFlowNodeConfiguration" + } + }, + "required": [ + "Collector" + ], + "title": "Collector", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Retrieval": { + "$ref": "#/definitions/RetrievalFlowNodeConfiguration" + } + }, + "required": [ + "Retrieval" + ], + "title": "Retrieval", + "type": "object" + } + ] + }, + "FlowNodeIODataType": { + "enum": [ + "String", + "Number", + "Boolean", + "Object", + "Array" + ], + "type": "string" + }, + "FlowNodeInput": { + "additionalProperties": false, + "properties": { + "Expression": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Type": { + "$ref": "#/definitions/FlowNodeIODataType" + } + }, + "required": [ + "Expression", + "Name", + "Type" + ], + "type": "object" + }, + "FlowNodeOutput": { + "additionalProperties": false, + "properties": { + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Type": { + "$ref": "#/definitions/FlowNodeIODataType" + } + }, + "required": [ + "Name", + "Type" + ], + "type": "object" + }, + "FlowNodeType": { + "enum": [ + "Input", + "Output", + "KnowledgeBase", + "Condition", + "Lex", + "Prompt", + "LambdaFunction", + "Agent", + "Storage", + "Retrieval", + "Iterator", + "Collector" + ], + "type": "string" + }, + "FlowStatus": { + "enum": [ + "Failed", + "Prepared", + "Preparing", + "NotPrepared" + ], + "type": "string" + }, + "FlowValidation": { + "additionalProperties": false, + "properties": { + "Message": { + "type": "string" + } + }, + "required": [ + "Message" + ], + "type": "object" + }, + "FlowValidations": { + "insertionOrder": false, + "items": { + "$ref": "#/definitions/FlowValidation" + }, + "type": "array" + }, + "GuardrailConfiguration": { + "additionalProperties": false, + "properties": { + "GuardrailIdentifier": { + "maxLength": 2048, + "pattern": "^(([a-z0-9]+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:guardrail/[a-z0-9]+))$", + "type": "string" + }, + "GuardrailVersion": { + "pattern": "^(([0-9]{1,8})|(DRAFT))$", + "type": "string" + } + }, + "type": "object" + }, + "InputFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "IteratorFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "KnowledgeBaseFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "GuardrailConfiguration": { + "$ref": "#/definitions/GuardrailConfiguration" + }, + "KnowledgeBaseId": { + "maxLength": 10, + "pattern": "^[0-9a-zA-Z]+$", + "type": "string" + }, + "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" + } + }, + "required": [ + "KnowledgeBaseId" + ], + "type": "object" + }, + "LambdaFunctionFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "LambdaArn": { + "maxLength": 2048, + "pattern": "^arn:(aws[a-zA-Z-]*)?:lambda:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:function:[a-zA-Z0-9-_\\.]+(:(\\$LATEST|[a-zA-Z0-9-_]+))?$", + "type": "string" + } + }, + "required": [ + "LambdaArn" + ], + "type": "object" + }, + "LexFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "BotAliasArn": { + "maxLength": 78, + "pattern": "^arn:aws(|-us-gov):lex:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:bot-alias/[0-9a-zA-Z]+/[0-9a-zA-Z]+$", + "type": "string" + }, + "LocaleId": { + "maxLength": 10, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "BotAliasArn", + "LocaleId" + ], + "type": "object" + }, + "OutputFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "PromptFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "GuardrailConfiguration": { + "$ref": "#/definitions/GuardrailConfiguration" + }, + "SourceConfiguration": { + "$ref": "#/definitions/PromptFlowNodeSourceConfiguration" + } + }, + "required": [ + "SourceConfiguration" + ], + "type": "object" + }, + "PromptFlowNodeInlineConfiguration": { + "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" + }, + "TemplateConfiguration": { + "$ref": "#/definitions/PromptTemplateConfiguration" + }, + "TemplateType": { + "$ref": "#/definitions/PromptTemplateType" + } + }, + "required": [ + "ModelId", + "TemplateConfiguration", + "TemplateType" + ], + "type": "object" + }, + "PromptFlowNodeResourceConfiguration": { + "additionalProperties": false, + "properties": { + "PromptArn": { + "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}(?::[0-9]{1,5})?)$", + "type": "string" + } + }, + "required": [ + "PromptArn" + ], + "type": "object" + }, + "PromptFlowNodeSourceConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "Resource": { + "$ref": "#/definitions/PromptFlowNodeResourceConfiguration" + } + }, + "required": [ + "Resource" + ], + "title": "Resource", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Inline": { + "$ref": "#/definitions/PromptFlowNodeInlineConfiguration" + } + }, + "required": [ + "Inline" + ], + "title": "Inline", + "type": "object" + } + ] + }, + "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" + }, + "RetrievalFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "ServiceConfiguration": { + "$ref": "#/definitions/RetrievalFlowNodeServiceConfiguration" + } + }, + "required": [ + "ServiceConfiguration" + ], + "type": "object" + }, + "RetrievalFlowNodeS3Configuration": { + "additionalProperties": false, + "properties": { + "BucketName": { + "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$", + "type": "string" + } + }, + "required": [ + "BucketName" + ], + "type": "object" + }, + "RetrievalFlowNodeServiceConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "S3": { + "$ref": "#/definitions/RetrievalFlowNodeS3Configuration" + } + }, + "title": "S3", + "type": "object" + } + ] + }, + "S3Location": { + "additionalProperties": false, + "properties": { + "Bucket": { + "maxLength": 63, + "minLength": 3, + "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$", + "type": "string" + }, + "Key": { + "maxLength": 1024, + "minLength": 1, + "type": "string" + }, + "Version": { + "maxLength": 1024, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "Bucket", + "Key" + ], + "type": "object" + }, + "StorageFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "ServiceConfiguration": { + "$ref": "#/definitions/StorageFlowNodeServiceConfiguration" + } + }, + "required": [ + "ServiceConfiguration" + ], + "type": "object" + }, + "StorageFlowNodeS3Configuration": { + "additionalProperties": false, + "properties": { + "BucketName": { + "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$", + "type": "string" + } + }, + "required": [ + "BucketName" + ], + "type": "object" + }, + "StorageFlowNodeServiceConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "S3": { + "$ref": "#/definitions/StorageFlowNodeS3Configuration" + } + }, + "title": "S3", + "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": 1011, + "minLength": 20, + "pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10}$", + "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" + }, + "Definition": { + "$ref": "#/definitions/FlowDefinition" + }, + "DefinitionS3Location": { + "$ref": "#/definitions/S3Location" + }, + "DefinitionString": { + "maxLength": 512000, + "type": "string" + }, + "DefinitionSubstitutions": { + "$ref": "#/definitions/DefinitionSubstitutions" + }, + "Description": { + "maxLength": 200, + "minLength": 1, + "type": "string" + }, + "ExecutionRoleArn": { + "maxLength": 2048, + "pattern": "^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/(service-role/)?.+$", + "type": "string" + }, + "Id": { + "pattern": "^[0-9a-zA-Z]{10}$", + "type": "string" + }, + "Name": { + "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", + "type": "string" + }, + "Status": { + "$ref": "#/definitions/FlowStatus" + }, + "Tags": { + "$ref": "#/definitions/TagsMap" + }, + "TestAliasTags": { + "$ref": "#/definitions/TagsMap" + }, + "UpdatedAt": { + "format": "date-time", + "type": "string" + }, + "Validations": { + "$ref": "#/definitions/FlowValidations" + }, + "Version": { + "maxLength": 5, + "minLength": 5, + "pattern": "^DRAFT$", + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/Arn", + "/properties/CreatedAt", + "/properties/Id", + "/properties/Status", + "/properties/UpdatedAt", + "/properties/Version", + "/properties/Validations" + ], + "required": [ + "ExecutionRoleArn", + "Name" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-flows", + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::Bedrock::Flow", + "writeOnlyProperties": [ + "/properties/DefinitionString", + "/properties/DefinitionS3Location", + "/properties/DefinitionSubstitutions" + ] +} diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-flowversion.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-flowversion.json new file mode 100644 index 0000000000..bac2d23666 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-flowversion.json @@ -0,0 +1,870 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/Description", + "/properties/FlowArn" + ], + "definitions": { + "AgentFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "AgentAliasArn": { + "maxLength": 2048, + "pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:agent-alias/[0-9a-zA-Z]{10}/[0-9a-zA-Z]{10}$", + "type": "string" + } + }, + "required": [ + "AgentAliasArn" + ], + "type": "object" + }, + "CollectorFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "ConditionFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "Conditions": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowCondition" + }, + "maxItems": 5, + "minItems": 1, + "type": "array" + } + }, + "required": [ + "Conditions" + ], + "type": "object" + }, + "FlowCondition": { + "additionalProperties": false, + "properties": { + "Expression": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + } + }, + "required": [ + "Name" + ], + "type": "object" + }, + "FlowConditionalConnectionConfiguration": { + "additionalProperties": false, + "properties": { + "Condition": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + } + }, + "required": [ + "Condition" + ], + "type": "object" + }, + "FlowConnection": { + "additionalProperties": false, + "properties": { + "Configuration": { + "$ref": "#/definitions/FlowConnectionConfiguration" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,100}$", + "type": "string" + }, + "Source": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Target": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Type": { + "$ref": "#/definitions/FlowConnectionType" + } + }, + "required": [ + "Name", + "Source", + "Target", + "Type" + ], + "type": "object" + }, + "FlowConnectionConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "Data": { + "$ref": "#/definitions/FlowDataConnectionConfiguration" + } + }, + "required": [ + "Data" + ], + "title": "Data", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Conditional": { + "$ref": "#/definitions/FlowConditionalConnectionConfiguration" + } + }, + "required": [ + "Conditional" + ], + "title": "Conditional", + "type": "object" + } + ] + }, + "FlowConnectionType": { + "enum": [ + "Data", + "Conditional" + ], + "type": "string" + }, + "FlowDataConnectionConfiguration": { + "additionalProperties": false, + "properties": { + "SourceOutput": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "TargetInput": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + } + }, + "required": [ + "SourceOutput", + "TargetInput" + ], + "type": "object" + }, + "FlowDefinition": { + "additionalProperties": false, + "properties": { + "Connections": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowConnection" + }, + "maxItems": 20, + "type": "array" + }, + "Nodes": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowNode" + }, + "maxItems": 20, + "type": "array" + } + }, + "type": "object" + }, + "FlowNode": { + "additionalProperties": false, + "properties": { + "Configuration": { + "$ref": "#/definitions/FlowNodeConfiguration" + }, + "Inputs": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowNodeInput" + }, + "maxItems": 5, + "type": "array" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Outputs": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/FlowNodeOutput" + }, + "maxItems": 5, + "type": "array" + }, + "Type": { + "$ref": "#/definitions/FlowNodeType" + } + }, + "required": [ + "Name", + "Type" + ], + "type": "object" + }, + "FlowNodeConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "Input": { + "$ref": "#/definitions/InputFlowNodeConfiguration" + } + }, + "required": [ + "Input" + ], + "title": "Input", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Output": { + "$ref": "#/definitions/OutputFlowNodeConfiguration" + } + }, + "required": [ + "Output" + ], + "title": "Output", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "KnowledgeBase": { + "$ref": "#/definitions/KnowledgeBaseFlowNodeConfiguration" + } + }, + "required": [ + "KnowledgeBase" + ], + "title": "KnowledgeBase", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Condition": { + "$ref": "#/definitions/ConditionFlowNodeConfiguration" + } + }, + "required": [ + "Condition" + ], + "title": "Condition", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Lex": { + "$ref": "#/definitions/LexFlowNodeConfiguration" + } + }, + "required": [ + "Lex" + ], + "title": "Lex", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Prompt": { + "$ref": "#/definitions/PromptFlowNodeConfiguration" + } + }, + "required": [ + "Prompt" + ], + "title": "Prompt", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "LambdaFunction": { + "$ref": "#/definitions/LambdaFunctionFlowNodeConfiguration" + } + }, + "required": [ + "LambdaFunction" + ], + "title": "LambdaFunction", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Agent": { + "$ref": "#/definitions/AgentFlowNodeConfiguration" + } + }, + "required": [ + "Agent" + ], + "title": "Agent", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Storage": { + "$ref": "#/definitions/StorageFlowNodeConfiguration" + } + }, + "required": [ + "Storage" + ], + "title": "Storage", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Retrieval": { + "$ref": "#/definitions/RetrievalFlowNodeConfiguration" + } + }, + "required": [ + "Retrieval" + ], + "title": "Retrieval", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Iterator": { + "$ref": "#/definitions/IteratorFlowNodeConfiguration" + } + }, + "required": [ + "Iterator" + ], + "title": "Iterator", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Collector": { + "$ref": "#/definitions/CollectorFlowNodeConfiguration" + } + }, + "required": [ + "Collector" + ], + "title": "Collector", + "type": "object" + } + ] + }, + "FlowNodeIODataType": { + "enum": [ + "String", + "Number", + "Boolean", + "Object", + "Array" + ], + "type": "string" + }, + "FlowNodeInput": { + "additionalProperties": false, + "properties": { + "Expression": { + "maxLength": 64, + "minLength": 1, + "type": "string" + }, + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Type": { + "$ref": "#/definitions/FlowNodeIODataType" + } + }, + "required": [ + "Expression", + "Name", + "Type" + ], + "type": "object" + }, + "FlowNodeOutput": { + "additionalProperties": false, + "properties": { + "Name": { + "pattern": "^[a-zA-Z]([_]?[0-9a-zA-Z]){1,50}$", + "type": "string" + }, + "Type": { + "$ref": "#/definitions/FlowNodeIODataType" + } + }, + "required": [ + "Name", + "Type" + ], + "type": "object" + }, + "FlowNodeType": { + "enum": [ + "Input", + "Output", + "KnowledgeBase", + "Condition", + "Lex", + "Prompt", + "LambdaFunction", + "Agent", + "Iterator", + "Collector", + "Storage", + "Retrieval" + ], + "type": "string" + }, + "FlowStatus": { + "enum": [ + "Failed", + "Prepared", + "Preparing", + "NotPrepared" + ], + "type": "string" + }, + "GuardrailConfiguration": { + "additionalProperties": false, + "properties": { + "GuardrailIdentifier": { + "maxLength": 2048, + "pattern": "^(([a-z0-9]+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:guardrail/[a-z0-9]+))$", + "type": "string" + }, + "GuardrailVersion": { + "pattern": "^(([0-9]{1,8})|(DRAFT))$", + "type": "string" + } + }, + "type": "object" + }, + "InputFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "IteratorFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "KnowledgeBaseFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "GuardrailConfiguration": { + "$ref": "#/definitions/GuardrailConfiguration" + }, + "KnowledgeBaseId": { + "maxLength": 10, + "pattern": "^[0-9a-zA-Z]+$", + "type": "string" + }, + "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" + } + }, + "required": [ + "KnowledgeBaseId" + ], + "type": "object" + }, + "LambdaFunctionFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "LambdaArn": { + "maxLength": 2048, + "pattern": "^arn:(aws[a-zA-Z-]*)?:lambda:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:function:[a-zA-Z0-9-_\\.]+(:(\\$LATEST|[a-zA-Z0-9-_]+))?$", + "type": "string" + } + }, + "required": [ + "LambdaArn" + ], + "type": "object" + }, + "LexFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "BotAliasArn": { + "maxLength": 78, + "pattern": "^arn:aws(|-us-gov):lex:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:bot-alias/[0-9a-zA-Z]+/[0-9a-zA-Z]+$", + "type": "string" + }, + "LocaleId": { + "maxLength": 10, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "BotAliasArn", + "LocaleId" + ], + "type": "object" + }, + "OutputFlowNodeConfiguration": { + "additionalProperties": false, + "type": "object" + }, + "PromptFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "GuardrailConfiguration": { + "$ref": "#/definitions/GuardrailConfiguration" + }, + "SourceConfiguration": { + "$ref": "#/definitions/PromptFlowNodeSourceConfiguration" + } + }, + "required": [ + "SourceConfiguration" + ], + "type": "object" + }, + "PromptFlowNodeInlineConfiguration": { + "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" + }, + "TemplateConfiguration": { + "$ref": "#/definitions/PromptTemplateConfiguration" + }, + "TemplateType": { + "$ref": "#/definitions/PromptTemplateType" + } + }, + "required": [ + "ModelId", + "TemplateConfiguration", + "TemplateType" + ], + "type": "object" + }, + "PromptFlowNodeResourceConfiguration": { + "additionalProperties": false, + "properties": { + "PromptArn": { + "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}(?::[0-9]{1,5})?)$", + "type": "string" + } + }, + "required": [ + "PromptArn" + ], + "type": "object" + }, + "PromptFlowNodeSourceConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "Resource": { + "$ref": "#/definitions/PromptFlowNodeResourceConfiguration" + } + }, + "required": [ + "Resource" + ], + "title": "Resource", + "type": "object" + }, + { + "additionalProperties": false, + "properties": { + "Inline": { + "$ref": "#/definitions/PromptFlowNodeInlineConfiguration" + } + }, + "required": [ + "Inline" + ], + "title": "Inline", + "type": "object" + } + ] + }, + "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" + }, + "RetrievalFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "ServiceConfiguration": { + "$ref": "#/definitions/RetrievalFlowNodeServiceConfiguration" + } + }, + "required": [ + "ServiceConfiguration" + ], + "type": "object" + }, + "RetrievalFlowNodeS3Configuration": { + "additionalProperties": false, + "properties": { + "BucketName": { + "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$", + "type": "string" + } + }, + "required": [ + "BucketName" + ], + "type": "object" + }, + "RetrievalFlowNodeServiceConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "S3": { + "$ref": "#/definitions/RetrievalFlowNodeS3Configuration" + } + }, + "title": "S3", + "type": "object" + } + ] + }, + "StorageFlowNodeConfiguration": { + "additionalProperties": false, + "properties": { + "ServiceConfiguration": { + "$ref": "#/definitions/StorageFlowNodeServiceConfiguration" + } + }, + "required": [ + "ServiceConfiguration" + ], + "type": "object" + }, + "StorageFlowNodeS3Configuration": { + "additionalProperties": false, + "properties": { + "BucketName": { + "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$", + "type": "string" + } + }, + "required": [ + "BucketName" + ], + "type": "object" + }, + "StorageFlowNodeServiceConfiguration": { + "oneOf": [ + { + "additionalProperties": false, + "properties": { + "S3": { + "$ref": "#/definitions/StorageFlowNodeS3Configuration" + } + }, + "title": "S3", + "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/FlowArn", + "/properties/Version" + ], + "properties": { + "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" + }, + "Definition": { + "$ref": "#/definitions/FlowDefinition" + }, + "Description": { + "maxLength": 200, + "minLength": 1, + "type": "string" + }, + "ExecutionRoleArn": { + "maxLength": 2048, + "pattern": "^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/(service-role/)?.+$", + "type": "string" + }, + "FlowArn": { + "pattern": "^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:flow/[0-9a-zA-Z]{10}$", + "type": "string" + }, + "FlowId": { + "pattern": "^[0-9a-zA-Z]{10}$", + "type": "string" + }, + "Name": { + "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", + "type": "string" + }, + "Status": { + "$ref": "#/definitions/FlowStatus" + }, + "Version": { + "pattern": "^[0-9]{1,5}$", + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/CreatedAt", + "/properties/Definition", + "/properties/ExecutionRoleArn", + "/properties/FlowId", + "/properties/Name", + "/properties/Status", + "/properties/Version", + "/properties/CustomerEncryptionKeyArn" + ], + "required": [ + "FlowArn" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-flows", + "tagging": { + "taggable": false + }, + "typeName": "AWS::Bedrock::FlowVersion" +} diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-prompt.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-prompt.json new file mode 100644 index 0000000000..5e10365bb5 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-prompt.json @@ -0,0 +1,258 @@ +{ + "additionalProperties": false, + "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" + }, + "TextS3Location": { + "$ref": "#/definitions/TextS3Location" + } + }, + "required": [], + "type": "object" + }, + "TextS3Location": { + "additionalProperties": false, + "properties": { + "Bucket": { + "maxLength": 63, + "minLength": 3, + "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$", + "type": "string" + }, + "Key": { + "maxLength": 1024, + "minLength": 1, + "type": "string" + }, + "Version": { + "maxLength": 1024, + "minLength": 1, + "type": "string" + } + }, + "required": [ + "Bucket", + "Key" + ], + "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})$", + "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" + }, + "Id": { + "pattern": "^[0-9a-zA-Z]{10}$", + "type": "string" + }, + "Name": { + "pattern": "^([0-9a-zA-Z][_-]?){1,100}$", + "type": "string" + }, + "Tags": { + "$ref": "#/definitions/TagsMap" + }, + "UpdatedAt": { + "format": "date-time", + "type": "string" + }, + "Variants": { + "insertionOrder": true, + "items": { + "$ref": "#/definitions/PromptVariant" + }, + "maxItems": 1, + "minItems": 0, + "type": "array" + }, + "Version": { + "maxLength": 5, + "minLength": 5, + "pattern": "^DRAFT$", + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/Arn", + "/properties/CreatedAt", + "/properties/Id", + "/properties/UpdatedAt", + "/properties/Version" + ], + "required": [ + "Name" + ], + "tagging": { + "cloudFormationSystemTags": false, + "tagOnCreate": true, + "tagProperty": "/properties/Tags", + "tagUpdatable": true, + "taggable": true + }, + "typeName": "AWS::Bedrock::Prompt", + "writeOnlyProperties": [ + "/properties/Variants/*/TemplateConfiguration/Text/TextS3Location" + ] +} diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-promptversion.json new file mode 100644 index 0000000000..b79f1da1a7 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-bedrock-promptversion.json @@ -0,0 +1,244 @@ +{ + "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_1/aws-nimblestudio-studio.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-nimblestudio-studio.json new file mode 100644 index 0000000000..bd6fcbeb38 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-nimblestudio-studio.json @@ -0,0 +1,99 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/StudioName", + "/properties/Tags" + ], + "definitions": { + "StudioEncryptionConfiguration": { + "additionalProperties": false, + "properties": { + "KeyArn": { + "minLength": 4, + "pattern": "^arn:.*", + "type": "string" + }, + "KeyType": { + "$ref": "#/definitions/StudioEncryptionConfigurationKeyType" + } + }, + "required": [ + "KeyType" + ], + "type": "object" + }, + "StudioEncryptionConfigurationKeyType": { + "enum": [ + "AWS_OWNED_KEY", + "CUSTOMER_MANAGED_KEY" + ], + "type": "string" + }, + "Tags": { + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + }, + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/StudioId" + ], + "properties": { + "AdminRoleArn": { + "type": "string" + }, + "DisplayName": { + "maxLength": 64, + "minLength": 0, + "type": "string" + }, + "HomeRegion": { + "maxLength": 50, + "minLength": 0, + "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]", + "type": "string" + }, + "SsoClientId": { + "type": "string" + }, + "StudioEncryptionConfiguration": { + "$ref": "#/definitions/StudioEncryptionConfiguration" + }, + "StudioId": { + "type": "string" + }, + "StudioName": { + "maxLength": 64, + "minLength": 3, + "pattern": "^[a-z0-9]*$", + "type": "string" + }, + "StudioUrl": { + "type": "string" + }, + "Tags": { + "$ref": "#/definitions/Tags" + }, + "UserRoleArn": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/HomeRegion", + "/properties/SsoClientId", + "/properties/StudioId", + "/properties/StudioUrl" + ], + "required": [ + "DisplayName", + "UserRoleArn", + "AdminRoleArn", + "StudioName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", + "typeName": "AWS::NimbleStudio::Studio" +} 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 219af20177..d6a18b6097 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py @@ -1973,7 +1973,6 @@ "aws-nimblestudio-launchprofile.json", "aws-nimblestudio-streamingimage.json", "aws-nimblestudio-studio.json", - "aws-nimblestudio-studiocomponent.json", "aws-oam-link.json", "aws-oam-sink.json", "aws-omics-annotationstore.json", diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-nimblestudio-studiocomponent.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-nimblestudio-studiocomponent.json new file mode 100644 index 0000000000..2604515a51 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-nimblestudio-studiocomponent.json @@ -0,0 +1,110 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/Subtype", + "/properties/StudioId", + "/properties/Tags" + ], + "definitions": { + "ScriptParameterKeyValue": { + "additionalProperties": false, + "properties": { + "Key": { + "type": "string" + }, + "Value": { + "type": "string" + } + }, + "type": "object" + }, + "StudioComponentInitializationScript": { + "additionalProperties": false, + "properties": { + "LaunchProfileProtocolVersion": { + "type": "string" + }, + "Platform": { + "type": "string" + }, + "RunContext": { + "type": "string" + }, + "Script": { + "type": "string" + } + }, + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/StudioComponentId" + ], + "properties": { + "Configuration": { + "type": "object" + }, + "Description": { + "type": "string" + }, + "Ec2SecurityGroupIds": { + "items": { + "type": "string" + }, + "type": "array", + "uniqueItems": false + }, + "InitializationScripts": { + "items": { + "$ref": "#/definitions/StudioComponentInitializationScript" + }, + "type": "array", + "uniqueItems": false + }, + "Name": { + "type": "string" + }, + "RuntimeRoleArn": { + "type": "string" + }, + "ScriptParameters": { + "items": { + "$ref": "#/definitions/ScriptParameterKeyValue" + }, + "type": "array", + "uniqueItems": false + }, + "SecureInitializationRoleArn": { + "type": "string" + }, + "StudioComponentId": { + "type": "string" + }, + "StudioId": { + "type": "string" + }, + "Subtype": { + "type": "string" + }, + "Tags": { + "patternProperties": { + "[a-zA-Z0-9]+": { + "type": "string" + } + }, + "type": "object" + }, + "Type": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/StudioComponentId" + ], + "required": [ + "Type", + "StudioId", + "Name" + ], + "typeName": "AWS::NimbleStudio::StudioComponent" +} 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 e385ba767f..4875e6f2b2 100644 --- a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py +++ b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py @@ -1806,6 +1806,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", diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ses-configurationset.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ses-configurationset.json deleted file mode 100644 index 94e600b9cd..0000000000 --- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ses-configurationset.json +++ /dev/null @@ -1,133 +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": { - "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/me_south_1/__init__.py b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py index 2d94d4b3e3..223973eac9 100644 --- a/src/cfnlint/data/schemas/providers/me_south_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py @@ -1570,7 +1570,10 @@ "aws-wafregional-sqlinjectionmatchset.json", "aws-wafregional-webaclassociation.json", "aws-wafregional-xssmatchset.json", + "aws-wafv2-ipset.json", "aws-wafv2-loggingconfiguration.json", + "aws-wafv2-regexpatternset.json", + "aws-wafv2-rulegroup.json", "aws-wafv2-webaclassociation.json", "aws-workspaces-workspace.json", "aws-xray-group.json", diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-ipset.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-ipset.json deleted file mode 100644 index 65b6b7ad16..0000000000 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-ipset.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Scope" - ], - "definitions": { - "EntityDescription": { - "pattern": "^[a-zA-Z0-9=:#@/\\-,.][a-zA-Z0-9+=:#@/\\-,.\\s]+[a-zA-Z0-9+=:#@/\\-,.]{1,256}$", - "type": "string" - }, - "EntityId": { - "pattern": "^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$", - "type": "string" - }, - "EntityName": { - "pattern": "^[0-9A-Za-z_-]{1,128}$", - "type": "string" - }, - "IPAddress": { - "maxLength": 50, - "minLength": 1, - "type": "string" - }, - "IPAddressVersion": { - "enum": [ - "IPV4", - "IPV6" - ], - "type": "string" - }, - "ResourceArn": { - "type": "string" - }, - "Scope": { - "enum": [ - "CLOUDFRONT", - "REGIONAL" - ], - "type": "string" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name", - "/properties/Id", - "/properties/Scope" - ], - "properties": { - "Addresses": { - "items": { - "$ref": "#/definitions/IPAddress" - }, - "type": "array" - }, - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "Description": { - "$ref": "#/definitions/EntityDescription" - }, - "IPAddressVersion": { - "$ref": "#/definitions/IPAddressVersion" - }, - "Id": { - "$ref": "#/definitions/EntityId" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Scope": { - "$ref": "#/definitions/Scope" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id" - ], - "required": [ - "Addresses", - "IPAddressVersion", - "Scope" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-wafv2.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::WAFv2::IPSet" -} diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-regexpatternset.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-regexpatternset.json deleted file mode 100644 index 246565624d..0000000000 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-regexpatternset.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Scope" - ], - "definitions": { - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name", - "/properties/Id", - "/properties/Scope" - ], - "properties": { - "Arn": { - "type": "string" - }, - "Description": { - "pattern": "^[a-zA-Z0-9=:#@/\\-,.][a-zA-Z0-9+=:#@/\\-,.\\s]+[a-zA-Z0-9+=:#@/\\-,.]{1,256}$", - "type": "string" - }, - "Id": { - "pattern": "^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$", - "type": "string" - }, - "Name": { - "pattern": "^[0-9A-Za-z_-]{1,128}$", - "type": "string" - }, - "RegularExpressionList": { - "items": { - "maxLength": 200, - "minLength": 0, - "type": "string" - }, - "type": "array" - }, - "Scope": { - "enum": [ - "CLOUDFRONT", - "REGIONAL" - ], - "type": "string" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "minItems": 1, - "type": "array" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id" - ], - "required": [ - "Scope", - "RegularExpressionList" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-wafv2.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::WAFv2::RegexPatternSet" -} diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-rulegroup.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-rulegroup.json deleted file mode 100644 index 57513d62ae..0000000000 --- a/src/cfnlint/data/schemas/providers/me_south_1/aws-wafv2-rulegroup.json +++ /dev/null @@ -1,1379 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name", - "/properties/Scope" - ], - "definitions": { - "AllowAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "AndStatement": { - "additionalProperties": false, - "properties": { - "Statements": { - "items": { - "$ref": "#/definitions/Statement" - }, - "type": "array" - } - }, - "required": [ - "Statements" - ], - "type": "object" - }, - "BlockAction": { - "additionalProperties": false, - "properties": { - "CustomResponse": { - "$ref": "#/definitions/CustomResponse" - } - }, - "type": "object" - }, - "Body": { - "additionalProperties": false, - "properties": { - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "type": "object" - }, - "BodyParsingFallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH", - "EVALUATE_AS_STRING" - ], - "type": "string" - }, - "ByteMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "PositionalConstraint": { - "$ref": "#/definitions/PositionalConstraint" - }, - "SearchString": { - "$ref": "#/definitions/SearchString" - }, - "SearchStringBase64": { - "$ref": "#/definitions/SearchStringBase64" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "PositionalConstraint", - "TextTransformations" - ], - "type": "object" - }, - "CaptchaAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "CaptchaConfig": { - "additionalProperties": false, - "properties": { - "ImmunityTimeProperty": { - "$ref": "#/definitions/ImmunityTimeProperty" - } - }, - "type": "object" - }, - "ChallengeAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "ChallengeConfig": { - "additionalProperties": false, - "properties": { - "ImmunityTimeProperty": { - "$ref": "#/definitions/ImmunityTimeProperty" - } - }, - "type": "object" - }, - "CookieMatchPattern": { - "additionalProperties": false, - "properties": { - "All": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "ExcludedCookies": { - "items": { - "maxLength": 60, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - }, - "IncludedCookies": { - "items": { - "maxLength": 60, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - } - }, - "type": "object" - }, - "Cookies": { - "additionalProperties": false, - "properties": { - "MatchPattern": { - "$ref": "#/definitions/CookieMatchPattern" - }, - "MatchScope": { - "$ref": "#/definitions/MapMatchScope" - }, - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "required": [ - "MatchPattern", - "MatchScope", - "OversizeHandling" - ], - "type": "object" - }, - "CountAction": { - "additionalProperties": false, - "properties": { - "CustomRequestHandling": { - "$ref": "#/definitions/CustomRequestHandling" - } - }, - "type": "object" - }, - "CustomHTTPHeader": { - "additionalProperties": false, - "properties": { - "Name": { - "$ref": "#/definitions/CustomHTTPHeaderName" - }, - "Value": { - "$ref": "#/definitions/CustomHTTPHeaderValue" - } - }, - "required": [ - "Name", - "Value" - ], - "type": "object" - }, - "CustomHTTPHeaderName": { - "maxLength": 64, - "minLength": 1, - "type": "string" - }, - "CustomHTTPHeaderValue": { - "maxLength": 255, - "minLength": 1, - "type": "string" - }, - "CustomRequestHandling": { - "additionalProperties": false, - "properties": { - "InsertHeaders": { - "items": { - "$ref": "#/definitions/CustomHTTPHeader" - }, - "minItems": 1, - "type": "array" - } - }, - "required": [ - "InsertHeaders" - ], - "type": "object" - }, - "CustomResponse": { - "additionalProperties": false, - "properties": { - "CustomResponseBodyKey": { - "pattern": "^[\\w\\-]+$", - "type": "string" - }, - "ResponseCode": { - "$ref": "#/definitions/ResponseStatusCode" - }, - "ResponseHeaders": { - "items": { - "$ref": "#/definitions/CustomHTTPHeader" - }, - "minItems": 1, - "type": "array" - } - }, - "required": [ - "ResponseCode" - ], - "type": "object" - }, - "CustomResponseBodies": { - "additionalProperties": false, - "minProperties": 1, - "patternProperties": { - "^[\\w\\-]+$": { - "$ref": "#/definitions/CustomResponseBody" - } - }, - "type": "object" - }, - "CustomResponseBody": { - "additionalProperties": false, - "properties": { - "Content": { - "$ref": "#/definitions/ResponseContent" - }, - "ContentType": { - "$ref": "#/definitions/ResponseContentType" - } - }, - "required": [ - "ContentType", - "Content" - ], - "type": "object" - }, - "EntityDescription": { - "pattern": "^[a-zA-Z0-9=:#@/\\-,.][a-zA-Z0-9+=:#@/\\-,.\\s]+[a-zA-Z0-9+=:#@/\\-,.]{1,256}$", - "type": "string" - }, - "EntityId": { - "pattern": "^[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$", - "type": "string" - }, - "EntityName": { - "pattern": "^[0-9A-Za-z_-]{1,128}$", - "type": "string" - }, - "EvaluationWindowSec": { - "enum": [ - 60, - 120, - 300, - 600 - ], - "type": "integer" - }, - "FieldToMatch": { - "additionalProperties": false, - "properties": { - "AllQueryArguments": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "Body": { - "$ref": "#/definitions/Body" - }, - "Cookies": { - "$ref": "#/definitions/Cookies" - }, - "Headers": { - "$ref": "#/definitions/Headers" - }, - "JA3Fingerprint": { - "$ref": "#/definitions/JA3Fingerprint" - }, - "JsonBody": { - "$ref": "#/definitions/JsonBody" - }, - "Method": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "QueryString": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "SingleHeader": { - "additionalProperties": false, - "properties": { - "Name": { - "type": "string" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "SingleQueryArgument": { - "additionalProperties": false, - "properties": { - "Name": { - "type": "string" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "UriPath": { - "format": "json", - "type": [ - "object", - "string" - ] - } - }, - "type": "object" - }, - "ForwardedIPConfiguration": { - "additionalProperties": false, - "properties": { - "FallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH" - ], - "type": "string" - }, - "HeaderName": { - "pattern": "^[a-zA-Z0-9-]{1,255}$", - "type": "string" - } - }, - "required": [ - "HeaderName", - "FallbackBehavior" - ], - "type": "object" - }, - "GeoMatchStatement": { - "additionalProperties": false, - "properties": { - "CountryCodes": { - "items": { - "maxLength": 2, - "minLength": 1, - "type": "string" - }, - "type": "array" - }, - "ForwardedIPConfig": { - "$ref": "#/definitions/ForwardedIPConfiguration" - } - }, - "type": "object" - }, - "HeaderMatchPattern": { - "additionalProperties": false, - "properties": { - "All": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "ExcludedHeaders": { - "items": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - }, - "IncludedHeaders": { - "items": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "maxItems": 199, - "minItems": 1, - "type": "array" - } - }, - "type": "object" - }, - "Headers": { - "additionalProperties": false, - "properties": { - "MatchPattern": { - "$ref": "#/definitions/HeaderMatchPattern" - }, - "MatchScope": { - "$ref": "#/definitions/MapMatchScope" - }, - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "required": [ - "MatchPattern", - "MatchScope", - "OversizeHandling" - ], - "type": "object" - }, - "IPSetForwardedIPConfiguration": { - "additionalProperties": false, - "properties": { - "FallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH" - ], - "type": "string" - }, - "HeaderName": { - "pattern": "^[a-zA-Z0-9-]{1,255}$", - "type": "string" - }, - "Position": { - "enum": [ - "FIRST", - "LAST", - "ANY" - ], - "type": "string" - } - }, - "required": [ - "HeaderName", - "FallbackBehavior", - "Position" - ], - "type": "object" - }, - "IPSetReferenceStatement": { - "additionalProperties": false, - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "IPSetForwardedIPConfig": { - "$ref": "#/definitions/IPSetForwardedIPConfiguration" - } - }, - "required": [ - "Arn" - ], - "type": "object" - }, - "ImmunityTimeProperty": { - "additionalProperties": false, - "properties": { - "ImmunityTime": { - "maximum": 259200, - "minimum": 60, - "type": "integer" - } - }, - "required": [ - "ImmunityTime" - ], - "type": "object" - }, - "JA3Fingerprint": { - "additionalProperties": false, - "properties": { - "FallbackBehavior": { - "enum": [ - "MATCH", - "NO_MATCH" - ], - "type": "string" - } - }, - "required": [ - "FallbackBehavior" - ], - "type": "object" - }, - "JsonBody": { - "additionalProperties": false, - "properties": { - "InvalidFallbackBehavior": { - "$ref": "#/definitions/BodyParsingFallbackBehavior" - }, - "MatchPattern": { - "$ref": "#/definitions/JsonMatchPattern" - }, - "MatchScope": { - "$ref": "#/definitions/JsonMatchScope" - }, - "OversizeHandling": { - "$ref": "#/definitions/OversizeHandling" - } - }, - "required": [ - "MatchPattern", - "MatchScope" - ], - "type": "object" - }, - "JsonMatchPattern": { - "additionalProperties": false, - "properties": { - "All": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "IncludedPaths": { - "items": { - "$ref": "#/definitions/JsonPointerPath" - }, - "type": "array" - } - }, - "type": "object" - }, - "JsonMatchScope": { - "enum": [ - "ALL", - "KEY", - "VALUE" - ], - "type": "string" - }, - "JsonPointerPath": { - "pattern": "^[\\/]+([^~]*(~[01])*){1,512}$", - "type": "string" - }, - "Label": { - "additionalProperties": false, - "properties": { - "Name": { - "$ref": "#/definitions/LabelName" - } - }, - "required": [ - "Name" - ], - "type": "object" - }, - "LabelMatchKey": { - "pattern": "^[0-9A-Za-z_:-]{1,1024}$", - "type": "string" - }, - "LabelMatchScope": { - "enum": [ - "LABEL", - "NAMESPACE" - ], - "type": "string" - }, - "LabelMatchStatement": { - "additionalProperties": false, - "properties": { - "Key": { - "$ref": "#/definitions/LabelMatchKey" - }, - "Scope": { - "$ref": "#/definitions/LabelMatchScope" - } - }, - "required": [ - "Scope", - "Key" - ], - "type": "object" - }, - "LabelName": { - "pattern": "^[0-9A-Za-z_:-]{1,1024}$", - "type": "string" - }, - "LabelSummary": { - "additionalProperties": false, - "properties": { - "Name": { - "$ref": "#/definitions/LabelName" - } - }, - "type": "object" - }, - "MapMatchScope": { - "enum": [ - "ALL", - "KEY", - "VALUE" - ], - "type": "string" - }, - "NotStatement": { - "additionalProperties": false, - "properties": { - "Statement": { - "$ref": "#/definitions/Statement" - } - }, - "required": [ - "Statement" - ], - "type": "object" - }, - "OrStatement": { - "additionalProperties": false, - "properties": { - "Statements": { - "items": { - "$ref": "#/definitions/Statement" - }, - "type": "array" - } - }, - "required": [ - "Statements" - ], - "type": "object" - }, - "OversizeHandling": { - "enum": [ - "CONTINUE", - "MATCH", - "NO_MATCH" - ], - "type": "string" - }, - "PositionalConstraint": { - "enum": [ - "EXACTLY", - "STARTS_WITH", - "ENDS_WITH", - "CONTAINS", - "CONTAINS_WORD" - ], - "type": "string" - }, - "RateBasedStatement": { - "additionalProperties": false, - "properties": { - "AggregateKeyType": { - "enum": [ - "IP", - "FORWARDED_IP", - "CONSTANT", - "CUSTOM_KEYS" - ], - "type": "string" - }, - "CustomKeys": { - "items": { - "$ref": "#/definitions/RateBasedStatementCustomKey" - }, - "maxItems": 5, - "type": "array" - }, - "EvaluationWindowSec": { - "$ref": "#/definitions/EvaluationWindowSec" - }, - "ForwardedIPConfig": { - "$ref": "#/definitions/ForwardedIPConfiguration" - }, - "Limit": { - "$ref": "#/definitions/RateLimit" - }, - "ScopeDownStatement": { - "$ref": "#/definitions/Statement" - } - }, - "required": [ - "Limit", - "AggregateKeyType" - ], - "type": "object" - }, - "RateBasedStatementCustomKey": { - "additionalProperties": false, - "properties": { - "Cookie": { - "$ref": "#/definitions/RateLimitCookie" - }, - "ForwardedIP": { - "$ref": "#/definitions/RateLimitForwardedIP" - }, - "HTTPMethod": { - "$ref": "#/definitions/RateLimitHTTPMethod" - }, - "Header": { - "$ref": "#/definitions/RateLimitHeader" - }, - "IP": { - "$ref": "#/definitions/RateLimitIP" - }, - "LabelNamespace": { - "$ref": "#/definitions/RateLimitLabelNamespace" - }, - "QueryArgument": { - "$ref": "#/definitions/RateLimitQueryArgument" - }, - "QueryString": { - "$ref": "#/definitions/RateLimitQueryString" - }, - "UriPath": { - "$ref": "#/definitions/RateLimitUriPath" - } - }, - "type": "object" - }, - "RateLimit": { - "maximum": 2000000000, - "minimum": 100, - "type": "integer" - }, - "RateLimitCookie": { - "additionalProperties": false, - "properties": { - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Name", - "TextTransformations" - ], - "type": "object" - }, - "RateLimitForwardedIP": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RateLimitHTTPMethod": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RateLimitHeader": { - "additionalProperties": false, - "properties": { - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Name", - "TextTransformations" - ], - "type": "object" - }, - "RateLimitIP": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RateLimitLabelNamespace": { - "additionalProperties": false, - "properties": { - "Namespace": { - "pattern": "^[0-9A-Za-z_:-]{1,1024}$", - "type": "string" - } - }, - "required": [ - "Namespace" - ], - "type": "object" - }, - "RateLimitQueryArgument": { - "additionalProperties": false, - "properties": { - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": ".*\\S.*", - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Name", - "TextTransformations" - ], - "type": "object" - }, - "RateLimitQueryString": { - "additionalProperties": false, - "properties": { - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "TextTransformations" - ], - "type": "object" - }, - "RateLimitUriPath": { - "additionalProperties": false, - "properties": { - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "TextTransformations" - ], - "type": "object" - }, - "RegexMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "RegexString": { - "maxLength": 512, - "minLength": 1, - "type": "string" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "RegexString", - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - }, - "RegexPatternSetReferenceStatement": { - "additionalProperties": false, - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "Arn", - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - }, - "ResourceArn": { - "maxLength": 2048, - "minLength": 20, - "type": "string" - }, - "ResponseContent": { - "maxLength": 10240, - "minLength": 1, - "type": "string" - }, - "ResponseContentType": { - "enum": [ - "TEXT_PLAIN", - "TEXT_HTML", - "APPLICATION_JSON" - ], - "type": "string" - }, - "ResponseStatusCode": { - "maximum": 599, - "minimum": 200, - "type": "integer" - }, - "Rule": { - "additionalProperties": false, - "properties": { - "Action": { - "$ref": "#/definitions/RuleAction" - }, - "CaptchaConfig": { - "$ref": "#/definitions/CaptchaConfig" - }, - "ChallengeConfig": { - "$ref": "#/definitions/ChallengeConfig" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Priority": { - "$ref": "#/definitions/RulePriority" - }, - "RuleLabels": { - "items": { - "$ref": "#/definitions/Label" - }, - "type": "array" - }, - "Statement": { - "$ref": "#/definitions/Statement" - }, - "VisibilityConfig": { - "$ref": "#/definitions/VisibilityConfig" - } - }, - "required": [ - "Name", - "Priority", - "Statement", - "VisibilityConfig" - ], - "type": "object" - }, - "RuleAction": { - "additionalProperties": false, - "properties": { - "Allow": { - "$ref": "#/definitions/AllowAction" - }, - "Block": { - "$ref": "#/definitions/BlockAction" - }, - "Captcha": { - "$ref": "#/definitions/CaptchaAction" - }, - "Challenge": { - "$ref": "#/definitions/ChallengeAction" - }, - "Count": { - "$ref": "#/definitions/CountAction" - } - }, - "type": "object" - }, - "RuleGroup": { - "additionalProperties": false, - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "Capacity": { - "minimum": 0, - "type": "integer" - }, - "Description": { - "$ref": "#/definitions/EntityDescription" - }, - "Id": { - "$ref": "#/definitions/EntityId" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Rules": { - "items": { - "$ref": "#/definitions/Rule" - }, - "type": "array" - }, - "VisibilityConfig": { - "$ref": "#/definitions/VisibilityConfig" - } - }, - "type": "object" - }, - "RulePriority": { - "minimum": 0, - "type": "integer" - }, - "Scope": { - "enum": [ - "CLOUDFRONT", - "REGIONAL" - ], - "type": "string" - }, - "SearchString": { - "type": "string" - }, - "SearchStringBase64": { - "type": "string" - }, - "SensitivityLevel": { - "enum": [ - "LOW", - "HIGH" - ], - "type": "string" - }, - "SizeConstraintStatement": { - "additionalProperties": false, - "properties": { - "ComparisonOperator": { - "enum": [ - "EQ", - "NE", - "LE", - "LT", - "GE", - "GT" - ], - "type": "string" - }, - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "Size": { - "maximum": 21474836480, - "minimum": 0, - "type": "number" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "ComparisonOperator", - "Size", - "TextTransformations" - ], - "type": "object" - }, - "SqliMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "SensitivityLevel": { - "$ref": "#/definitions/SensitivityLevel" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - }, - "Statement": { - "additionalProperties": false, - "properties": { - "AndStatement": { - "$ref": "#/definitions/AndStatement" - }, - "ByteMatchStatement": { - "$ref": "#/definitions/ByteMatchStatement" - }, - "GeoMatchStatement": { - "$ref": "#/definitions/GeoMatchStatement" - }, - "IPSetReferenceStatement": { - "$ref": "#/definitions/IPSetReferenceStatement" - }, - "LabelMatchStatement": { - "$ref": "#/definitions/LabelMatchStatement" - }, - "NotStatement": { - "$ref": "#/definitions/NotStatement" - }, - "OrStatement": { - "$ref": "#/definitions/OrStatement" - }, - "RateBasedStatement": { - "$ref": "#/definitions/RateBasedStatement" - }, - "RegexMatchStatement": { - "$ref": "#/definitions/RegexMatchStatement" - }, - "RegexPatternSetReferenceStatement": { - "$ref": "#/definitions/RegexPatternSetReferenceStatement" - }, - "SizeConstraintStatement": { - "$ref": "#/definitions/SizeConstraintStatement" - }, - "SqliMatchStatement": { - "$ref": "#/definitions/SqliMatchStatement" - }, - "XssMatchStatement": { - "$ref": "#/definitions/XssMatchStatement" - } - }, - "type": "object" - }, - "Tag": { - "additionalProperties": false, - "properties": { - "Key": { - "maxLength": 128, - "minLength": 1, - "type": "string" - }, - "Value": { - "maxLength": 256, - "minLength": 0, - "type": "string" - } - }, - "type": "object" - }, - "TextTransformation": { - "additionalProperties": false, - "properties": { - "Priority": { - "$ref": "#/definitions/TextTransformationPriority" - }, - "Type": { - "$ref": "#/definitions/TextTransformationType" - } - }, - "required": [ - "Priority", - "Type" - ], - "type": "object" - }, - "TextTransformationPriority": { - "minimum": 0, - "type": "integer" - }, - "TextTransformationType": { - "enum": [ - "NONE", - "COMPRESS_WHITE_SPACE", - "HTML_ENTITY_DECODE", - "LOWERCASE", - "CMD_LINE", - "URL_DECODE", - "BASE64_DECODE", - "HEX_DECODE", - "MD5", - "REPLACE_COMMENTS", - "ESCAPE_SEQ_DECODE", - "SQL_HEX_DECODE", - "CSS_DECODE", - "JS_DECODE", - "NORMALIZE_PATH", - "NORMALIZE_PATH_WIN", - "REMOVE_NULLS", - "REPLACE_NULLS", - "BASE64_DECODE_EXT", - "URL_DECODE_UNI", - "UTF8_TO_UNICODE" - ], - "type": "string" - }, - "VisibilityConfig": { - "additionalProperties": false, - "properties": { - "CloudWatchMetricsEnabled": { - "type": "boolean" - }, - "MetricName": { - "maxLength": 128, - "minLength": 1, - "pattern": "^[\\w#:\\.\\-/]+$", - "type": "string" - }, - "SampledRequestsEnabled": { - "type": "boolean" - } - }, - "required": [ - "SampledRequestsEnabled", - "CloudWatchMetricsEnabled", - "MetricName" - ], - "type": "object" - }, - "XssMatchStatement": { - "additionalProperties": false, - "properties": { - "FieldToMatch": { - "$ref": "#/definitions/FieldToMatch" - }, - "TextTransformations": { - "items": { - "$ref": "#/definitions/TextTransformation" - }, - "type": "array" - } - }, - "required": [ - "FieldToMatch", - "TextTransformations" - ], - "type": "object" - } - }, - "primaryIdentifier": [ - "/properties/Name", - "/properties/Id", - "/properties/Scope" - ], - "properties": { - "Arn": { - "$ref": "#/definitions/ResourceArn" - }, - "AvailableLabels": { - "items": { - "$ref": "#/definitions/LabelSummary" - }, - "type": "array" - }, - "Capacity": { - "minimum": 0, - "type": "integer" - }, - "ConsumedLabels": { - "items": { - "$ref": "#/definitions/LabelSummary" - }, - "type": "array" - }, - "CustomResponseBodies": { - "$ref": "#/definitions/CustomResponseBodies" - }, - "Description": { - "$ref": "#/definitions/EntityDescription" - }, - "Id": { - "$ref": "#/definitions/EntityId" - }, - "LabelNamespace": { - "$ref": "#/definitions/LabelName" - }, - "Name": { - "$ref": "#/definitions/EntityName" - }, - "Rules": { - "items": { - "$ref": "#/definitions/Rule" - }, - "type": "array" - }, - "Scope": { - "$ref": "#/definitions/Scope" - }, - "Tags": { - "items": { - "$ref": "#/definitions/Tag" - }, - "minItems": 1, - "type": "array" - }, - "VisibilityConfig": { - "$ref": "#/definitions/VisibilityConfig" - } - }, - "readOnlyProperties": [ - "/properties/Arn", - "/properties/Id", - "/properties/LabelNamespace", - "/properties/AvailableLabels/*/Name", - "/properties/ConsumedLabels/*/Name" - ], - "required": [ - "Capacity", - "Scope", - "VisibilityConfig" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-wafv2.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::WAFv2::RuleGroup" -} diff --git a/src/cfnlint/data/schemas/providers/us_east_1/__init__.py b/src/cfnlint/data/schemas/providers/us_east_1/__init__.py index a33dcb0916..59f467623b 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_east_1/__init__.py @@ -1304,6 +1304,7 @@ "AWS::WAFv2::WebACL", "AWS::WAFv2::WebACLAssociation", "AWS::Wisdom::AIAgent", + "AWS::Wisdom::AIAgentVersion", "AWS::Wisdom::AIPrompt", "AWS::Wisdom::AIPromptVersion", "AWS::Wisdom::Assistant", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json index cc44d3f9b3..66303b0112 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-codebuild-project.json @@ -103,6 +103,7 @@ }, "ComputeType": { "enum": [ + "ATTRIBUTE_BASED_COMPUTE", "BUILD_GENERAL1_2XLARGE", "BUILD_GENERAL1_LARGE", "BUILD_GENERAL1_MEDIUM", diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-launchprofile.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-launchprofile.json index 65cb5d10be..8c2231d665 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-launchprofile.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-launchprofile.json @@ -6,75 +6,43 @@ "/properties/Tags" ], "definitions": { - "AutomaticTerminationMode": { - "enum": [ - "DEACTIVATED", - "ACTIVATED" - ], - "type": "string" - }, - "SessionBackupMode": { - "enum": [ - "AUTOMATIC", - "DEACTIVATED" - ], - "type": "string" - }, - "SessionPersistenceMode": { - "enum": [ - "DEACTIVATED", - "ACTIVATED" - ], - "type": "string" - }, "StreamConfiguration": { "additionalProperties": false, "properties": { "AutomaticTerminationMode": { - "$ref": "#/definitions/AutomaticTerminationMode" + "type": "string" }, "ClipboardMode": { - "$ref": "#/definitions/StreamingClipboardMode" + "type": "string" }, "Ec2InstanceTypes": { "items": { - "$ref": "#/definitions/StreamingInstanceType" + "type": "string" }, - "maxItems": 30, - "minItems": 1, - "type": "array" + "type": "array", + "uniqueItems": false }, "MaxSessionLengthInMinutes": { - "default": 690, - "maximum": 43200, - "minimum": 1, "type": "number" }, "MaxStoppedSessionLengthInMinutes": { - "default": 0, - "maximum": 5760, - "minimum": 0, "type": "number" }, "SessionBackup": { "$ref": "#/definitions/StreamConfigurationSessionBackup" }, "SessionPersistenceMode": { - "$ref": "#/definitions/SessionPersistenceMode" + "type": "string" }, "SessionStorage": { "$ref": "#/definitions/StreamConfigurationSessionStorage" }, "StreamingImageIds": { "items": { - "maxLength": 22, - "minLength": 0, - "pattern": "^[a-zA-Z0-9-_]*$", "type": "string" }, - "maxItems": 20, - "minItems": 1, - "type": "array" + "type": "array", + "uniqueItems": false }, "VolumeConfiguration": { "$ref": "#/definitions/VolumeConfiguration" @@ -82,8 +50,8 @@ }, "required": [ "ClipboardMode", - "Ec2InstanceTypes", - "StreamingImageIds" + "StreamingImageIds", + "Ec2InstanceTypes" ], "type": "object" }, @@ -91,13 +59,10 @@ "additionalProperties": false, "properties": { "MaxBackupsToRetain": { - "default": 0, - "maximum": 10, - "minimum": 0, "type": "number" }, "Mode": { - "$ref": "#/definitions/SessionBackupMode" + "type": "string" } }, "type": "object" @@ -107,10 +72,10 @@ "properties": { "Mode": { "items": { - "$ref": "#/definitions/StreamingSessionStorageMode" + "type": "string" }, - "minItems": 1, - "type": "array" + "type": "array", + "uniqueItems": false }, "Root": { "$ref": "#/definitions/StreamingSessionStorageRoot" @@ -121,59 +86,13 @@ ], "type": "object" }, - "StreamingClipboardMode": { - "enum": [ - "ENABLED", - "DISABLED" - ], - "type": "string" - }, - "StreamingInstanceType": { - "enum": [ - "g4dn.xlarge", - "g4dn.2xlarge", - "g4dn.4xlarge", - "g4dn.8xlarge", - "g4dn.12xlarge", - "g4dn.16xlarge", - "g3.4xlarge", - "g3s.xlarge", - "g5.xlarge", - "g5.2xlarge", - "g5.4xlarge", - "g5.8xlarge", - "g5.16xlarge" - ], - "type": "string" - }, - "StreamingSessionStorageMode": { - "enum": [ - "UPLOAD" - ], - "type": "string" - }, "StreamingSessionStorageRoot": { "additionalProperties": false, "properties": { "Linux": { - "maxLength": 128, - "minLength": 1, - "pattern": "^(\\$HOME|/)[/]?([A-Za-z0-9-_]+/)*([A-Za-z0-9_-]+)$", "type": "string" }, "Windows": { - "maxLength": 128, - "minLength": 1, - "pattern": "^((\\%HOMEPATH\\%)|[a-zA-Z]:)[\\\\/](?:[a-zA-Z0-9_-]+[\\\\/])*[a-zA-Z0-9_-]+$", - "type": "string" - } - }, - "type": "object" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - ".+": { "type": "string" } }, @@ -183,21 +102,12 @@ "additionalProperties": false, "properties": { "Iops": { - "default": 3000, - "maximum": 16000, - "minimum": 3000, "type": "number" }, "Size": { - "default": 500, - "maximum": 16000, - "minimum": 100, "type": "number" }, "Throughput": { - "default": 125, - "maximum": 1000, - "minimum": 125, "type": "number" } }, @@ -205,38 +115,30 @@ } }, "primaryIdentifier": [ - "/properties/LaunchProfileId", - "/properties/StudioId" + "/properties/LaunchProfileId" ], "properties": { "Description": { - "maxLength": 256, - "minLength": 0, "type": "string" }, "Ec2SubnetIds": { "items": { "type": "string" }, - "maxItems": 6, - "minItems": 0, - "type": "array" + "type": "array", + "uniqueItems": false }, "LaunchProfileId": { "type": "string" }, "LaunchProfileProtocolVersions": { "items": { - "maxLength": 10, - "minLength": 0, - "pattern": "^2021\\-03\\-31$", "type": "string" }, - "type": "array" + "type": "array", + "uniqueItems": false }, "Name": { - "maxLength": 64, - "minLength": 1, "type": "string" }, "StreamConfiguration": { @@ -246,28 +148,31 @@ "items": { "type": "string" }, - "maxItems": 100, - "minItems": 1, - "type": "array" + "type": "array", + "uniqueItems": false }, "StudioId": { "type": "string" }, "Tags": { - "$ref": "#/definitions/Tags" + "patternProperties": { + "[a-zA-Z0-9]+": { + "type": "string" + } + }, + "type": "object" } }, "readOnlyProperties": [ "/properties/LaunchProfileId" ], "required": [ - "StudioId", - "Name", - "StudioComponentIds", "Ec2SubnetIds", + "StudioComponentIds", "StreamConfiguration", - "LaunchProfileProtocolVersions" + "LaunchProfileProtocolVersions", + "StudioId", + "Name" ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", "typeName": "AWS::NimbleStudio::LaunchProfile" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-streamingimage.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-streamingimage.json index b5ee8ecb65..9c4d6d1a3c 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-streamingimage.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-streamingimage.json @@ -1,77 +1,60 @@ { "additionalProperties": false, "createOnlyProperties": [ - "/properties/Ec2ImageId", "/properties/StudioId", - "/properties/Tags" + "/properties/Tags", + "/properties/Ec2ImageId" ], "definitions": { "StreamingImageEncryptionConfiguration": { "additionalProperties": false, "properties": { "KeyArn": { - "minLength": 4, - "pattern": "^arn:.*", "type": "string" }, "KeyType": { - "$ref": "#/definitions/StreamingImageEncryptionConfigurationKeyType" + "type": "string" } }, "required": [ "KeyType" ], "type": "object" - }, - "StreamingImageEncryptionConfigurationKeyType": { - "enum": [ - "CUSTOMER_MANAGED_KEY" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - ".+": { - "type": "string" - } - }, - "type": "object" } }, "primaryIdentifier": [ - "/properties/StudioId", "/properties/StreamingImageId" ], "properties": { "Description": { - "maxLength": 256, - "minLength": 0, "type": "string" }, "Ec2ImageId": { - "pattern": "^ami-[0-9A-z]+$", "type": "string" }, "EncryptionConfiguration": { "$ref": "#/definitions/StreamingImageEncryptionConfiguration" }, + "EncryptionConfigurationKeyArn": { + "type": "string" + }, + "EncryptionConfigurationKeyType": { + "type": "string" + }, "EulaIds": { "items": { "type": "string" }, - "type": "array" + "type": "array", + "uniqueItems": false }, "Name": { - "maxLength": 64, - "minLength": 0, "type": "string" }, "Owner": { "type": "string" }, "Platform": { - "pattern": "^[a-zA-Z]*$", "type": "string" }, "StreamingImageId": { @@ -81,21 +64,27 @@ "type": "string" }, "Tags": { - "$ref": "#/definitions/Tags" + "patternProperties": { + "[a-zA-Z0-9]+": { + "type": "string" + } + }, + "type": "object" } }, "readOnlyProperties": [ - "/properties/EncryptionConfiguration", + "/properties/Platform", "/properties/EulaIds", "/properties/Owner", - "/properties/Platform", + "/properties/EncryptionConfiguration.KeyArn", + "/properties/EncryptionConfiguration", + "/properties/EncryptionConfiguration.KeyType", "/properties/StreamingImageId" ], "required": [ - "StudioId", "Ec2ImageId", + "StudioId", "Name" ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", "typeName": "AWS::NimbleStudio::StreamingImage" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studio.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studio.json index bd6fcbeb38..aa10123571 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studio.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studio.json @@ -9,34 +9,16 @@ "additionalProperties": false, "properties": { "KeyArn": { - "minLength": 4, - "pattern": "^arn:.*", "type": "string" }, "KeyType": { - "$ref": "#/definitions/StudioEncryptionConfigurationKeyType" + "type": "string" } }, "required": [ "KeyType" ], "type": "object" - }, - "StudioEncryptionConfigurationKeyType": { - "enum": [ - "AWS_OWNED_KEY", - "CUSTOMER_MANAGED_KEY" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - ".+": { - "type": "string" - } - }, - "type": "object" } }, "primaryIdentifier": [ @@ -47,14 +29,9 @@ "type": "string" }, "DisplayName": { - "maxLength": 64, - "minLength": 0, "type": "string" }, "HomeRegion": { - "maxLength": 50, - "minLength": 0, - "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]", "type": "string" }, "SsoClientId": { @@ -67,33 +44,34 @@ "type": "string" }, "StudioName": { - "maxLength": 64, - "minLength": 3, - "pattern": "^[a-z0-9]*$", "type": "string" }, "StudioUrl": { "type": "string" }, "Tags": { - "$ref": "#/definitions/Tags" + "patternProperties": { + "[a-zA-Z0-9]+": { + "type": "string" + } + }, + "type": "object" }, "UserRoleArn": { "type": "string" } }, "readOnlyProperties": [ + "/properties/StudioId", "/properties/HomeRegion", "/properties/SsoClientId", - "/properties/StudioId", "/properties/StudioUrl" ], "required": [ - "DisplayName", "UserRoleArn", - "AdminRoleArn", - "StudioName" + "DisplayName", + "StudioName", + "AdminRoleArn" ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", "typeName": "AWS::NimbleStudio::Studio" } diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studiocomponent.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studiocomponent.json index f77a351878..99ed08b6c2 100644 --- a/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studiocomponent.json +++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-nimblestudio-studiocomponent.json @@ -1,8 +1,8 @@ { "additionalProperties": false, "createOnlyProperties": [ - "/properties/StudioId", "/properties/Subtype", + "/properties/StudioId", "/properties/Tags" ], "definitions": { @@ -10,13 +10,9 @@ "additionalProperties": false, "properties": { "Name": { - "maxLength": 40, - "minLength": 1, "type": "string" }, "Value": { - "maxLength": 64, - "minLength": 1, "type": "string" } }, @@ -29,16 +25,13 @@ "items": { "$ref": "#/definitions/ActiveDirectoryComputerAttribute" }, - "maxItems": 50, - "minItems": 0, - "type": "array" + "type": "array", + "uniqueItems": false }, "DirectoryId": { "type": "string" }, "OrganizationalUnitDistinguishedName": { - "maxLength": 2000, - "minLength": 1, "type": "string" } }, @@ -56,13 +49,6 @@ }, "type": "object" }, - "LaunchProfilePlatform": { - "enum": [ - "LINUX", - "WINDOWS" - ], - "type": "string" - }, "LicenseServiceConfiguration": { "additionalProperties": false, "properties": { @@ -76,14 +62,9 @@ "additionalProperties": false, "properties": { "Key": { - "maxLength": 64, - "minLength": 1, - "pattern": "^[a-zA-Z_][a-zA-Z0-9_]+$", "type": "string" }, "Value": { - "maxLength": 256, - "minLength": 1, "type": "string" } }, @@ -99,130 +80,48 @@ "type": "string" }, "LinuxMountPoint": { - "maxLength": 128, - "minLength": 0, - "pattern": "^(/?|(\\$HOME)?(/[^/\\n\\s\\\\]+)*)$", "type": "string" }, "ShareName": { "type": "string" }, "WindowsMountDrive": { - "pattern": "^[A-Z]$", "type": "string" } }, "type": "object" }, "StudioComponentConfiguration": { - "oneOf": [ - { - "additionalProperties": false, - "properties": { - "ActiveDirectoryConfiguration": { - "$ref": "#/definitions/ActiveDirectoryConfiguration" - } - }, - "required": [ - "ActiveDirectoryConfiguration" - ], - "title": "ActiveDirectoryConfiguration", - "type": "object" + "additionalProperties": false, + "properties": { + "ActiveDirectoryConfiguration": { + "$ref": "#/definitions/ActiveDirectoryConfiguration" }, - { - "additionalProperties": false, - "properties": { - "ComputeFarmConfiguration": { - "$ref": "#/definitions/ComputeFarmConfiguration" - } - }, - "required": [ - "ComputeFarmConfiguration" - ], - "title": "ComputeFarmConfiguration", - "type": "object" + "ComputeFarmConfiguration": { + "$ref": "#/definitions/ComputeFarmConfiguration" }, - { - "additionalProperties": false, - "properties": { - "LicenseServiceConfiguration": { - "$ref": "#/definitions/LicenseServiceConfiguration" - } - }, - "required": [ - "LicenseServiceConfiguration" - ], - "title": "LicenseServiceConfiguration", - "type": "object" + "LicenseServiceConfiguration": { + "$ref": "#/definitions/LicenseServiceConfiguration" }, - { - "additionalProperties": false, - "properties": { - "SharedFileSystemConfiguration": { - "$ref": "#/definitions/SharedFileSystemConfiguration" - } - }, - "required": [ - "SharedFileSystemConfiguration" - ], - "title": "SharedFileSystemConfiguration", - "type": "object" + "SharedFileSystemConfiguration": { + "$ref": "#/definitions/SharedFileSystemConfiguration" } - ] + }, + "type": "object" }, "StudioComponentInitializationScript": { "additionalProperties": false, "properties": { "LaunchProfileProtocolVersion": { - "maxLength": 10, - "minLength": 0, - "pattern": "^2021\\-03\\-31$", "type": "string" }, "Platform": { - "$ref": "#/definitions/LaunchProfilePlatform" + "type": "string" }, "RunContext": { - "$ref": "#/definitions/StudioComponentInitializationScriptRunContext" + "type": "string" }, "Script": { - "maxLength": 5120, - "minLength": 1, - "type": "string" - } - }, - "type": "object" - }, - "StudioComponentInitializationScriptRunContext": { - "enum": [ - "SYSTEM_INITIALIZATION", - "USER_INITIALIZATION" - ], - "type": "string" - }, - "StudioComponentSubtype": { - "enum": [ - "AWS_MANAGED_MICROSOFT_AD", - "AMAZON_FSX_FOR_WINDOWS", - "AMAZON_FSX_FOR_LUSTRE", - "CUSTOM" - ], - "type": "string" - }, - "StudioComponentType": { - "enum": [ - "ACTIVE_DIRECTORY", - "SHARED_FILE_SYSTEM", - "COMPUTE_FARM", - "LICENSE_SERVICE", - "CUSTOM" - ], - "type": "string" - }, - "Tags": { - "additionalProperties": false, - "patternProperties": { - ".+": { "type": "string" } }, @@ -230,54 +129,38 @@ } }, "primaryIdentifier": [ - "/properties/StudioComponentId", - "/properties/StudioId" + "/properties/StudioComponentId" ], "properties": { "Configuration": { "$ref": "#/definitions/StudioComponentConfiguration" }, "Description": { - "maxLength": 256, - "minLength": 0, "type": "string" }, "Ec2SecurityGroupIds": { "items": { "type": "string" }, - "maxItems": 30, - "minItems": 0, - "type": "array" + "type": "array", + "uniqueItems": false }, "InitializationScripts": { "items": { "$ref": "#/definitions/StudioComponentInitializationScript" }, - "type": "array" + "type": "array", + "uniqueItems": false }, "Name": { - "maxLength": 64, - "minLength": 0, - "type": "string" - }, - "RuntimeRoleArn": { - "maxLength": 2048, - "minLength": 0, "type": "string" }, "ScriptParameters": { "items": { "$ref": "#/definitions/ScriptParameterKeyValue" }, - "maxItems": 30, - "minItems": 0, - "type": "array" - }, - "SecureInitializationRoleArn": { - "maxLength": 2048, - "minLength": 0, - "type": "string" + "type": "array", + "uniqueItems": false }, "StudioComponentId": { "type": "string" @@ -286,23 +169,27 @@ "type": "string" }, "Subtype": { - "$ref": "#/definitions/StudioComponentSubtype" + "type": "string" }, "Tags": { - "$ref": "#/definitions/Tags" + "patternProperties": { + "[a-zA-Z0-9]+": { + "type": "string" + } + }, + "type": "object" }, "Type": { - "$ref": "#/definitions/StudioComponentType" + "type": "string" } }, "readOnlyProperties": [ "/properties/StudioComponentId" ], "required": [ + "Type", "StudioId", - "Name", - "Type" + "Name" ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", "typeName": "AWS::NimbleStudio::StudioComponent" } diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-wisdom-aiagentversion.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-wisdom-aiagentversion.json similarity index 100% rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-wisdom-aiagentversion.json rename to src/cfnlint/data/schemas/providers/us_east_1/aws-wisdom-aiagentversion.json 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 312b76eb2e..5e500fa2de 100644 --- a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py @@ -1958,7 +1958,6 @@ "aws-networkmanager-transitgatewayregistration.json", "aws-networkmanager-transitgatewayroutetableattachment.json", "aws-networkmanager-vpcattachment.json", - "aws-nimblestudio-studio.json", "aws-oam-link.json", "aws-oam-sink.json", "aws-opensearchserverless-accesspolicy.json", diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-nimblestudio-studio.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-nimblestudio-studio.json new file mode 100644 index 0000000000..bd6fcbeb38 --- /dev/null +++ b/src/cfnlint/data/schemas/providers/us_east_2/aws-nimblestudio-studio.json @@ -0,0 +1,99 @@ +{ + "additionalProperties": false, + "createOnlyProperties": [ + "/properties/StudioName", + "/properties/Tags" + ], + "definitions": { + "StudioEncryptionConfiguration": { + "additionalProperties": false, + "properties": { + "KeyArn": { + "minLength": 4, + "pattern": "^arn:.*", + "type": "string" + }, + "KeyType": { + "$ref": "#/definitions/StudioEncryptionConfigurationKeyType" + } + }, + "required": [ + "KeyType" + ], + "type": "object" + }, + "StudioEncryptionConfigurationKeyType": { + "enum": [ + "AWS_OWNED_KEY", + "CUSTOMER_MANAGED_KEY" + ], + "type": "string" + }, + "Tags": { + "additionalProperties": false, + "patternProperties": { + ".+": { + "type": "string" + } + }, + "type": "object" + } + }, + "primaryIdentifier": [ + "/properties/StudioId" + ], + "properties": { + "AdminRoleArn": { + "type": "string" + }, + "DisplayName": { + "maxLength": 64, + "minLength": 0, + "type": "string" + }, + "HomeRegion": { + "maxLength": 50, + "minLength": 0, + "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]", + "type": "string" + }, + "SsoClientId": { + "type": "string" + }, + "StudioEncryptionConfiguration": { + "$ref": "#/definitions/StudioEncryptionConfiguration" + }, + "StudioId": { + "type": "string" + }, + "StudioName": { + "maxLength": 64, + "minLength": 3, + "pattern": "^[a-z0-9]*$", + "type": "string" + }, + "StudioUrl": { + "type": "string" + }, + "Tags": { + "$ref": "#/definitions/Tags" + }, + "UserRoleArn": { + "type": "string" + } + }, + "readOnlyProperties": [ + "/properties/HomeRegion", + "/properties/SsoClientId", + "/properties/StudioId", + "/properties/StudioUrl" + ], + "required": [ + "DisplayName", + "UserRoleArn", + "AdminRoleArn", + "StudioName" + ], + "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-nimblestudio", + "typeName": "AWS::NimbleStudio::Studio" +} diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json index 09b442e9f8..23ae4e9d20 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json +++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-codebuild-project.json @@ -103,6 +103,7 @@ }, "ComputeType": { "enum": [ + "ATTRIBUTE_BASED_COMPUTE", "BUILD_GENERAL1_2XLARGE", "BUILD_GENERAL1_LARGE", "BUILD_GENERAL1_MEDIUM", diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json index 09b442e9f8..23ae4e9d20 100644 --- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json +++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-codebuild-project.json @@ -103,6 +103,7 @@ }, "ComputeType": { "enum": [ + "ATTRIBUTE_BASED_COMPUTE", "BUILD_GENERAL1_2XLARGE", "BUILD_GENERAL1_LARGE", "BUILD_GENERAL1_MEDIUM", 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 a512608237..f727ec9d78 100644 --- a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py @@ -1331,6 +1331,8 @@ "aws-emr-studiosessionmapping.json", "aws-emrcontainers-virtualcluster.json", "aws-emrserverless-application.json", + "aws-events-apidestination.json", + "aws-events-archive.json", "aws-events-endpoint.json", "aws-events-eventbus.json", "aws-events-eventbuspolicy.json", diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-events-apidestination.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-events-apidestination.json deleted file mode 100644 index 84f7d5fd6e..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_1/aws-events-apidestination.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/Name" - ], - "primaryIdentifier": [ - "/properties/Name" - ], - "properties": { - "Arn": { - "type": "string" - }, - "ConnectionArn": { - "pattern": "^arn:aws([a-z]|\\-)*:events:([a-z]|\\d|\\-)*:([0-9]{12})?:connection\\/[\\.\\-_A-Za-z0-9]+\\/[\\-A-Za-z0-9]+$", - "type": "string" - }, - "Description": { - "maxLength": 512, - "type": "string" - }, - "HttpMethod": { - "enum": [ - "GET", - "HEAD", - "POST", - "OPTIONS", - "PUT", - "DELETE", - "PATCH" - ], - "type": "string" - }, - "InvocationEndpoint": { - "pattern": "^((%[0-9A-Fa-f]{2}|[-()_.!~*';/?:@\\x26=+$,A-Za-z0-9])+)([).!';/?:,])?$", - "type": "string" - }, - "InvocationRateLimitPerSecond": { - "minimum": 1, - "type": "integer" - }, - "Name": { - "maxLength": 64, - "minLength": 1, - "pattern": "[\\.\\-_A-Za-z0-9]+", - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "required": [ - "ConnectionArn", - "InvocationEndpoint", - "HttpMethod" - ], - "typeName": "AWS::Events::ApiDestination" -} diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-events-archive.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-events-archive.json deleted file mode 100644 index c1d778374c..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_1/aws-events-archive.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/ArchiveName", - "/properties/SourceArn" - ], - "primaryIdentifier": [ - "/properties/ArchiveName" - ], - "properties": { - "ArchiveName": { - "maxLength": 48, - "minLength": 1, - "pattern": "[\\.\\-_A-Za-z0-9]+", - "type": "string" - }, - "Arn": { - "type": "string" - }, - "Description": { - "type": "string" - }, - "EventPattern": { - "format": "json", - "type": [ - "object", - "string" - ] - }, - "RetentionDays": { - "type": "integer" - }, - "SourceArn": { - "type": "string" - } - }, - "readOnlyProperties": [ - "/properties/Arn" - ], - "required": [ - "SourceArn" - ], - "typeName": "AWS::Events::Archive" -} 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 603a1cadef..4894a18fee 100644 --- a/src/cfnlint/data/schemas/providers/us_west_2/__init__.py +++ b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py @@ -2591,6 +2591,7 @@ "aws-wafv2-webacl.json", "aws-wafv2-webaclassociation.json", "aws-wisdom-aiagent.json", + "aws-wisdom-aiagentversion.json", "aws-wisdom-aiprompt.json", "aws-wisdom-aipromptversion.json", "aws-wisdom-assistant.json", diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-wisdom-aiagentversion.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-wisdom-aiagentversion.json deleted file mode 100644 index 3bd54b165f..0000000000 --- a/src/cfnlint/data/schemas/providers/us_west_2/aws-wisdom-aiagentversion.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "additionalIdentifiers": [ - [ - "/properties/AIAgentArn", - "/properties/AssistantArn" - ] - ], - "additionalProperties": false, - "createOnlyProperties": [ - "/properties/AssistantId", - "/properties/AIAgentId", - "/properties/ModifiedTimeSeconds" - ], - "definitions": {}, - "primaryIdentifier": [ - "/properties/AssistantId", - "/properties/AIAgentId", - "/properties/VersionNumber" - ], - "properties": { - "AIAgentArn": { - "pattern": "^arn:[a-z-]*?:wisdom:[a-z0-9-]*?:[0-9]{12}:[a-z-]*?/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}(?:/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})?$", - "type": "string" - }, - "AIAgentId": { - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$", - "type": "string" - }, - "AIAgentVersionId": { - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}(:[A-Z0-9_$]+){0,1}$", - "type": "string" - }, - "AssistantArn": { - "pattern": "^arn:[a-z-]*?:wisdom:[a-z0-9-]*?:[0-9]{12}:[a-z-]*?/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}(?:/[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})?$", - "type": "string" - }, - "AssistantId": { - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$", - "type": "string" - }, - "ModifiedTimeSeconds": { - "type": "number" - }, - "VersionNumber": { - "type": "number" - } - }, - "readOnlyProperties": [ - "/properties/AIAgentVersionId", - "/properties/AIAgentArn", - "/properties/AssistantArn", - "/properties/VersionNumber" - ], - "required": [ - "AssistantId", - "AIAgentId" - ], - "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git", - "tagging": { - "cloudFormationSystemTags": false, - "tagOnCreate": false, - "tagUpdatable": false, - "taggable": false - }, - "typeName": "AWS::Wisdom::AIAgentVersion" -}