resolve conflicts

Author: godwingrs22

schema_source/cloudformation-docs.json

@@ -11824,6 +11824,7 @@
       "DestinationSecurityGroupId": "The ID of the destination VPC security group.\n\nYou must specify exactly one of the following: `CidrIp` , `CidrIpv6` , `DestinationPrefixListId` , or `DestinationSecurityGroupId` .",
       "FromPort": "If the protocol is TCP or UDP, this is the start of the port range. If the protocol is ICMP or ICMPv6, this is the ICMP type or -1 (all ICMP types).",
       "IpProtocol": "The IP protocol name ( `tcp` , `udp` , `icmp` , `icmpv6` ) or number (see [Protocol Numbers](https://docs.aws.amazon.com/http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml) ).\n\nUse `-1` to specify all protocols. When authorizing security group rules, specifying `-1` or a protocol number other than `tcp` , `udp` , `icmp` , or `icmpv6` allows traffic on all ports, regardless of any port range you specify. For `tcp` , `udp` , and `icmp` , you must specify a port range. For `icmpv6` , the port range is optional; if you omit the port range, traffic for all types and codes is allowed.",
+      "SourceSecurityGroupId": "",
       "ToPort": "If the protocol is TCP or UDP, this is the end of the port range. If the protocol is ICMP or ICMPv6, this is the ICMP code or -1 (all ICMP codes). If the start port is -1 (all ICMP types), then the end port must be -1 (all ICMP codes)."
     },
     "AWS::EC2::SecurityGroup Ingress": {
@@ -37316,7 +37317,6 @@
       "NamespaceName": "The name of the namespace. Must be between 3-64 alphanumeric characters in lowercase, and it cannot be a reserved word. A list of reserved words can be found in [Reserved Words](https://docs.aws.amazon.com//redshift/latest/dg/r_pg_keywords.html) in the Amazon Redshift Database Developer Guide.",
       "NamespaceResourcePolicy": "The resource policy that will be attached to the namespace.",
       "RedshiftIdcApplicationArn": "The ARN for the Redshift application that integrates with IAM Identity Center.",
-      "SnapshotCopyConfigurations": "",
       "Tags": "The map of the key-value pairs used to tag the namespace."
     },
     "AWS::RedshiftServerless::Namespace Namespace": {
@@ -37334,11 +37334,6 @@
       "NamespaceName": "The name of the namespace. Must be between 3-64 alphanumeric characters in lowercase, and it cannot be a reserved word. A list of reserved words can be found in [Reserved Words](https://docs.aws.amazon.com//redshift/latest/dg/r_pg_keywords.html) in the Amazon Redshift Database Developer Guide.",
       "Status": "The status of the namespace."
     },
-    "AWS::RedshiftServerless::Namespace SnapshotCopyConfiguration": {
-      "DestinationKmsKeyId": "The ID of the KMS key to use to encrypt your snapshots in the destination AWS Region .",
-      "DestinationRegion": "The destination AWS Region to copy snapshots to.",
-      "SnapshotRetentionPeriod": "The retention period of snapshots that are copied to the destination AWS Region ."
-    },
     "AWS::RedshiftServerless::Namespace Tag": {
       "Key": "The key to use in the tag.",
       "Value": "The value of the tag."

schema_source/cloudformation.schema.json

@@ -3025,6 +3025,11 @@
               "markdownDescription": "The setting for the subdomain.",
               "title": "SubDomainSettings",
               "type": "array"
+            },
+            "UpdateStatus": {
+              "markdownDescription": "The status of the domain update operation that is currently in progress. The following list describes the valid update states.\n\n- **REQUESTING_CERTIFICATE** - The certificate is in the process of being updated.\n- **PENDING_VERIFICATION** - Indicates that an Amplify managed certificate is in the process of being verified. This occurs during the creation of a custom domain or when a custom domain is updated to use a managed certificate.\n- **IMPORTING_CUSTOM_CERTIFICATE** - Indicates that an Amplify custom certificate is in the process of being imported. This occurs during the creation of a custom domain or when a custom domain is updated to use a custom certificate.\n- **PENDING_DEPLOYMENT** - Indicates that the subdomain or certificate changes are being propagated.\n- **AWAITING_APP_CNAME** - Amplify is waiting for CNAME records corresponding to subdomains to be propagated. If your custom domain is on Route\u00a053, Amplify handles this for you automatically. For more information about custom domains, see [Setting up custom domains](https://docs.aws.amazon.com/amplify/latest/userguide/custom-domains.html) in the *Amplify Hosting User Guide* .\n- **UPDATE_COMPLETE** - The certificate has been associated with a domain.\n- **UPDATE_FAILED** - The certificate has failed to be provisioned or associated, and there is no existing active certificate to roll back to.",
+              "title": "UpdateStatus",
+              "type": "string"
             }
           },
           "required": [
@@ -76627,6 +76632,11 @@
           "title": "IpProtocol",
           "type": "string"
         },
+        "SourceSecurityGroupId": {
+          "markdownDescription": "",
+          "title": "SourceSecurityGroupId",
+          "type": "string"
+        },
         "ToPort": {
           "markdownDescription": "If the protocol is TCP or UDP, this is the end of the port range. If the protocol is ICMP or ICMPv6, this is the ICMP code or -1 (all ICMP codes). If the start port is -1 (all ICMP types), then the end port must be -1 (all ICMP codes).",
           "title": "ToPort",