This release adds new origin timeout options: 1) ResponseCompletionTimeout and 2) OriginReadTimeout (for S3 origins)

aws-sdk-dotnet-automation · aws-sdk-dotnet-automation · commit 41204fee3646 · 2025-07-30T18:23:09.000Z
diff --git a/generator/ServiceModels/cloudfront/cloudfront-2020-05-31.api.json b/generator/ServiceModels/cloudfront/cloudfront-2020-05-31.api.json
@@ -8458,6 +8458,7 @@
         "VpcOriginConfig":{"shape":"VpcOriginConfig"},
         "ConnectionAttempts":{"shape":"integer"},
         "ConnectionTimeout":{"shape":"integer"},
+        "ResponseCompletionTimeout":{"shape":"integer"},
         "OriginShield":{"shape":"OriginShield"},
         "OriginAccessControlId":{"shape":"string"}
       }
@@ -9582,7 +9583,8 @@
       "type":"structure",
       "required":["OriginAccessIdentity"],
       "members":{
-        "OriginAccessIdentity":{"shape":"string"}
+        "OriginAccessIdentity":{"shape":"string"},
+        "OriginReadTimeout":{"shape":"integer"}
       }
     },
     "SSLSupportMethod":{
diff --git a/generator/ServiceModels/cloudfront/cloudfront-2020-05-31.docs.json b/generator/ServiceModels/cloudfront/cloudfront-2020-05-31.docs.json
diff --git a/generator/ServiceModels/cloudfront/cloudfront-2020-05-31.normal.json b/generator/ServiceModels/cloudfront/cloudfront-2020-05-31.normal.json
diff --git a/sdk/src/Services/CloudFront/Generated/Model/CacheBehavior.cs b/sdk/src/Services/CloudFront/Generated/Model/CacheBehavior.cs
@@ -64,7 +64,14 @@ namespace Amazon.CloudFront.Model
     /// To add, change, or remove one or more cache behaviors, update the distribution configuration
     /// and specify all of the cache behaviors that you want to include in the updated distribution.
     /// </para>
-    ///  
+    ///  <important> 
+    /// <para>
+    /// If your minimum TTL is greater than 0, CloudFront will cache content for at least
+    /// the duration specified in the cache policy's minimum TTL, even if the <c>Cache-Control:
+    /// no-cache</c>, <c>no-store</c>, or <c>private</c> directives are present in the origin
+    /// headers.
+    /// </para>
+    ///  </important> 
     /// <para>
     /// For more information about cache behaviors, see <a href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/distribution-web-values-specify.html#DownloadDistValuesCacheBehavior">Cache
     /// Behavior Settings</a> in the <i>Amazon CloudFront Developer Guide</i>.
diff --git a/sdk/src/Services/CloudFront/Generated/Model/CachePolicyConfig.cs b/sdk/src/Services/CloudFront/Generated/Model/CachePolicyConfig.cs
@@ -47,7 +47,14 @@ namespace Amazon.CloudFront.Model
     /// The default, minimum, and maximum time to live (TTL) values that you want objects
     /// to stay in the CloudFront cache.
     /// </para>
-    ///  </li> </ul> 
+    ///  <important> 
+    /// <para>
+    /// If your minimum TTL is greater than 0, CloudFront will cache content for at least
+    /// the duration specified in the cache policy's minimum TTL, even if the <c>Cache-Control:
+    /// no-cache</c>, <c>no-store</c>, or <c>private</c> directives are present in the origin
+    /// headers.
+    /// </para>
+    ///  </important> </li> </ul> 
     /// <para>
     /// The headers, cookies, and query strings that are included in the cache key are also
     /// included in requests that CloudFront sends to the origin. CloudFront sends a request
diff --git a/sdk/src/Services/CloudFront/Generated/Model/CreateCachePolicyRequest.cs b/sdk/src/Services/CloudFront/Generated/Model/CreateCachePolicyRequest.cs
@@ -49,7 +49,14 @@ namespace Amazon.CloudFront.Model
     /// The default, minimum, and maximum time to live (TTL) values that you want objects
     /// to stay in the CloudFront cache.
     /// </para>
-    ///  </li> </ul> 
+    ///  <important> 
+    /// <para>
+    /// If your minimum TTL is greater than 0, CloudFront will cache content for at least
+    /// the duration specified in the cache policy's minimum TTL, even if the <c>Cache-Control:
+    /// no-cache</c>, <c>no-store</c>, or <c>private</c> directives are present in the origin
+    /// headers.
+    /// </para>
+    ///  </important> </li> </ul> 
     /// <para>
     /// The headers, cookies, and query strings that are included in the cache key are also
     /// included in requests that CloudFront sends to the origin. CloudFront sends a request
diff --git a/sdk/src/Services/CloudFront/Generated/Model/CustomOriginConfig.cs b/sdk/src/Services/CloudFront/Generated/Model/CustomOriginConfig.cs
@@ -153,7 +153,7 @@ internal bool IsSetOriginProtocolPolicy()
         ///  
         /// <para>
         /// For more information, see <a href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout">Response
-        /// timeout (custom origins only)</a> in the <i>Amazon CloudFront Developer Guide</i>.
+        /// timeout</a> in the <i>Amazon CloudFront Developer Guide</i>.
         /// </para>
         /// </summary>
         public int? OriginReadTimeout
diff --git a/sdk/src/Services/CloudFront/Generated/Model/DefaultCacheBehavior.cs b/sdk/src/Services/CloudFront/Generated/Model/DefaultCacheBehavior.cs
@@ -33,6 +33,15 @@ namespace Amazon.CloudFront.Model
     /// A complex type that describes the default cache behavior if you don't specify a <c>CacheBehavior</c>
     /// element or if request URLs don't match any of the values of <c>PathPattern</c> in
     /// <c>CacheBehavior</c> elements. You must create exactly one default cache behavior.
+    /// 
+    ///  <important> 
+    /// <para>
+    /// If your minimum TTL is greater than 0, CloudFront will cache content for at least
+    /// the duration specified in the cache policy's minimum TTL, even if the <c>Cache-Control:
+    /// no-cache</c>, <c>no-store</c>, or <c>private</c> directives are present in the origin
+    /// headers.
+    /// </para>
+    ///  </important>
     /// </summary>
     public partial class DefaultCacheBehavior
     {
diff --git a/sdk/src/Services/CloudFront/Generated/Model/DistributionConfig.cs b/sdk/src/Services/CloudFront/Generated/Model/DistributionConfig.cs
@@ -201,7 +201,7 @@ internal bool IsSetComment()
         /// Gets and sets the property ConnectionMode. 
         /// <para>
         /// This field specifies whether the connection mode is through a standard distribution
-        /// (direct) or a multi-tenant distribution with distribution tenants(tenant-only).
+        /// (direct) or a multi-tenant distribution with distribution tenants (tenant-only).
         /// </para>
         /// </summary>
         public ConnectionMode ConnectionMode
diff --git a/sdk/src/Services/CloudFront/Generated/Model/DistributionSummary.cs b/sdk/src/Services/CloudFront/Generated/Model/DistributionSummary.cs
@@ -196,7 +196,7 @@ internal bool IsSetComment()
         /// Gets and sets the property ConnectionMode. 
         /// <para>
         /// This field specifies whether the connection mode is through a standard distribution
-        /// (direct) or a multi-tenant distribution with distribution tenants(tenant-only).
+        /// (direct) or a multi-tenant distribution with distribution tenants (tenant-only).
         /// </para>
         /// </summary>
         public ConnectionMode ConnectionMode
diff --git a/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateDistributionRequestMarshaller.cs b/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateDistributionRequestMarshaller.cs
@@ -813,11 +813,15 @@ public IRequest Marshall(CreateDistributionRequest publicRequest)
                                         xmlWriter.WriteElementString("OriginShieldRegion", StringUtils.FromString(publicRequestDistributionConfigOriginsItemsValue.OriginShield.OriginShieldRegion));
                                     xmlWriter.WriteEndElement();
                                 }
+                                if(publicRequestDistributionConfigOriginsItemsValue.IsSetResponseCompletionTimeout())
+                                    xmlWriter.WriteElementString("ResponseCompletionTimeout", StringUtils.FromInt(publicRequestDistributionConfigOriginsItemsValue.ResponseCompletionTimeout.Value));
                                 if (publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig != null)
                                 {
                                     xmlWriter.WriteStartElement("S3OriginConfig");
                                     if(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.IsSetOriginAccessIdentity())
                                         xmlWriter.WriteElementString("OriginAccessIdentity", StringUtils.FromString(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.OriginAccessIdentity));
+                                    if(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.IsSetOriginReadTimeout())
+                                        xmlWriter.WriteElementString("OriginReadTimeout", StringUtils.FromInt(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.OriginReadTimeout.Value));
                                     xmlWriter.WriteEndElement();
                                 }
                                 if (publicRequestDistributionConfigOriginsItemsValue.VpcOriginConfig != null)
diff --git a/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateDistributionWithTagsRequestMarshaller.cs b/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/CreateDistributionWithTagsRequestMarshaller.cs
@@ -808,11 +808,15 @@ public IRequest Marshall(CreateDistributionWithTagsRequest publicRequest)
                                             xmlWriter.WriteElementString("OriginShieldRegion", StringUtils.FromString(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.OriginShield.OriginShieldRegion));
                                         xmlWriter.WriteEndElement();
                                     }
+                                    if(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.IsSetResponseCompletionTimeout())
+                                        xmlWriter.WriteElementString("ResponseCompletionTimeout", StringUtils.FromInt(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.ResponseCompletionTimeout.Value));
                                     if (publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.S3OriginConfig != null)
                                     {
                                         xmlWriter.WriteStartElement("S3OriginConfig");
                                         if(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.S3OriginConfig.IsSetOriginAccessIdentity())
                                             xmlWriter.WriteElementString("OriginAccessIdentity", StringUtils.FromString(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.S3OriginConfig.OriginAccessIdentity));
+                                        if(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.S3OriginConfig.IsSetOriginReadTimeout())
+                                            xmlWriter.WriteElementString("OriginReadTimeout", StringUtils.FromInt(publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.S3OriginConfig.OriginReadTimeout.Value));
                                         xmlWriter.WriteEndElement();
                                     }
                                     if (publicRequestDistributionConfigWithTagsDistributionConfigOriginsItemsValue.VpcOriginConfig != null)
diff --git a/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/OriginUnmarshaller.cs b/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/OriginUnmarshaller.cs
@@ -110,6 +110,12 @@ public Origin Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.OriginShield = unmarshaller.Unmarshall(context);
                         continue;
                     }
+                    if (context.TestExpression("ResponseCompletionTimeout", targetDepth))
+                    {
+                        var unmarshaller = NullableIntUnmarshaller.Instance;
+                        unmarshalledObject.ResponseCompletionTimeout = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                     if (context.TestExpression("S3OriginConfig", targetDepth))
                     {
                         var unmarshaller = S3OriginConfigUnmarshaller.Instance;
diff --git a/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/S3OriginConfigUnmarshaller.cs b/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/S3OriginConfigUnmarshaller.cs
@@ -62,6 +62,12 @@ public S3OriginConfig Unmarshall(XmlUnmarshallerContext context)
                         unmarshalledObject.OriginAccessIdentity = unmarshaller.Unmarshall(context);
                         continue;
                     }
+                    if (context.TestExpression("OriginReadTimeout", targetDepth))
+                    {
+                        var unmarshaller = NullableIntUnmarshaller.Instance;
+                        unmarshalledObject.OriginReadTimeout = unmarshaller.Unmarshall(context);
+                        continue;
+                    }
                 }
                 else if (context.IsEndElement && context.CurrentDepth < originalDepth)
                 {
diff --git a/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/UpdateDistributionRequestMarshaller.cs b/sdk/src/Services/CloudFront/Generated/Model/Internal/MarshallTransformations/UpdateDistributionRequestMarshaller.cs
@@ -821,11 +821,15 @@ public IRequest Marshall(UpdateDistributionRequest publicRequest)
                                         xmlWriter.WriteElementString("OriginShieldRegion", StringUtils.FromString(publicRequestDistributionConfigOriginsItemsValue.OriginShield.OriginShieldRegion));
                                     xmlWriter.WriteEndElement();
                                 }
+                                if(publicRequestDistributionConfigOriginsItemsValue.IsSetResponseCompletionTimeout())
+                                    xmlWriter.WriteElementString("ResponseCompletionTimeout", StringUtils.FromInt(publicRequestDistributionConfigOriginsItemsValue.ResponseCompletionTimeout.Value));
                                 if (publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig != null)
                                 {
                                     xmlWriter.WriteStartElement("S3OriginConfig");
                                     if(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.IsSetOriginAccessIdentity())
                                         xmlWriter.WriteElementString("OriginAccessIdentity", StringUtils.FromString(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.OriginAccessIdentity));
+                                    if(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.IsSetOriginReadTimeout())
+                                        xmlWriter.WriteElementString("OriginReadTimeout", StringUtils.FromInt(publicRequestDistributionConfigOriginsItemsValue.S3OriginConfig.OriginReadTimeout.Value));
                                     xmlWriter.WriteEndElement();
                                 }
                                 if (publicRequestDistributionConfigOriginsItemsValue.VpcOriginConfig != null)
diff --git a/sdk/src/Services/CloudFront/Generated/Model/ListDistributionsByConnectionModeRequest.cs b/sdk/src/Services/CloudFront/Generated/Model/ListDistributionsByConnectionModeRequest.cs
@@ -43,7 +43,7 @@ public partial class ListDistributionsByConnectionModeRequest : AmazonCloudFront
         /// Gets and sets the property ConnectionMode. 
         /// <para>
         /// This field specifies whether the connection mode is through a standard distribution
-        /// (direct) or a multi-tenant distribution with distribution tenants(tenant-only).
+        /// (direct) or a multi-tenant distribution with distribution tenants (tenant-only).
         /// </para>
         /// </summary>
         [AWSProperty(Required=true)]
diff --git a/sdk/src/Services/CloudFront/Generated/Model/Origin.cs b/sdk/src/Services/CloudFront/Generated/Model/Origin.cs
@@ -89,6 +89,7 @@ public partial class Origin
         private string _originAccessControlId;
         private string _originPath;
         private OriginShield _originShield;
+        private int? _responseCompletionTimeout;
         private S3OriginConfig _s3OriginConfig;
         private VpcOriginConfig _vpcOriginConfig;
 
@@ -311,6 +312,37 @@ internal bool IsSetOriginShield()
             return this._originShield != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property ResponseCompletionTimeout. 
+        /// <para>
+        /// The time (in seconds) that a request from CloudFront to the origin can stay open and
+        /// wait for a response. If the complete response isn't received from the origin by this
+        /// time, CloudFront ends the connection.
+        /// </para>
+        ///  
+        /// <para>
+        /// The value for <c>ResponseCompletionTimeout</c> must be equal to or greater than the
+        /// value for <c>OriginReadTimeout</c>. If you don't set a value for <c>ResponseCompletionTimeout</c>,
+        /// CloudFront doesn't enforce a maximum value.
+        /// </para>
+        ///  
+        /// <para>
+        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#response-completion-timeout">Response
+        /// completion timeout</a> in the <i>Amazon CloudFront Developer Guide</i>.
+        /// </para>
+        /// </summary>
+        public int? ResponseCompletionTimeout
+        {
+            get { return this._responseCompletionTimeout; }
+            set { this._responseCompletionTimeout = value; }
+        }
+
+        // Check to see if ResponseCompletionTimeout property is set
+        internal bool IsSetResponseCompletionTimeout()
+        {
+            return this._responseCompletionTimeout.HasValue; 
+        }
+
         /// <summary>
         /// Gets and sets the property S3OriginConfig. 
         /// <para>
diff --git a/sdk/src/Services/CloudFront/Generated/Model/S3OriginConfig.cs b/sdk/src/Services/CloudFront/Generated/Model/S3OriginConfig.cs
@@ -37,6 +37,7 @@ namespace Amazon.CloudFront.Model
     public partial class S3OriginConfig
     {
         private string _originAccessIdentity;
+        private int? _originReadTimeout;
 
         /// <summary>
         /// Gets and sets the property OriginAccessIdentity. 
@@ -98,5 +99,31 @@ internal bool IsSetOriginAccessIdentity()
             return this._originAccessIdentity != null;
         }
 
+        /// <summary>
+        /// Gets and sets the property OriginReadTimeout. 
+        /// <para>
+        /// Specifies how long, in seconds, CloudFront waits for a response from the origin. This
+        /// is also known as the <i>origin response timeout</i>. The minimum timeout is 1 second,
+        /// the maximum is 120 seconds, and the default (if you don't specify otherwise) is 30
+        /// seconds.
+        /// </para>
+        ///  
+        /// <para>
+        /// For more information, see <a href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout">Response
+        /// timeout</a> in the <i>Amazon CloudFront Developer Guide</i>.
+        /// </para>
+        /// </summary>
+        public int? OriginReadTimeout
+        {
+            get { return this._originReadTimeout; }
+            set { this._originReadTimeout = value; }
+        }
+
+        // Check to see if OriginReadTimeout property is set
+        internal bool IsSetOriginReadTimeout()
+        {
+            return this._originReadTimeout.HasValue; 
+        }
+
     }
 }
diff --git a/sdk/src/Services/CloudFront/Generated/Model/UpdateCachePolicyRequest.cs b/sdk/src/Services/CloudFront/Generated/Model/UpdateCachePolicyRequest.cs
@@ -52,7 +52,14 @@ namespace Amazon.CloudFront.Model
     /// Call <c>UpdateCachePolicy</c> by providing the entire cache policy configuration,
     /// including the fields that you modified and those that you didn't.
     /// </para>
-    ///  </li> </ol>
+    ///  </li> </ol> <important> 
+    /// <para>
+    /// If your minimum TTL is greater than 0, CloudFront will cache content for at least
+    /// the duration specified in the cache policy's minimum TTL, even if the <c>Cache-Control:
+    /// no-cache</c>, <c>no-store</c>, or <c>private</c> directives are present in the origin
+    /// headers.
+    /// </para>
+    ///  </important>
     /// </summary>
     public partial class UpdateCachePolicyRequest : AmazonCloudFrontRequest
     {
diff --git a/sdk/src/Services/CloudFront/Generated/Model/VpcOriginConfig.cs b/sdk/src/Services/CloudFront/Generated/Model/VpcOriginConfig.cs
@@ -74,7 +74,7 @@ internal bool IsSetOriginKeepaliveTimeout()
         ///  
         /// <para>
         /// For more information, see <a href="https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/DownloadDistValuesOrigin.html#DownloadDistValuesOriginResponseTimeout">Response
-        /// timeout (custom origins only)</a> in the <i>Amazon CloudFront Developer Guide</i>.
+        /// timeout</a> in the <i>Amazon CloudFront Developer Guide</i>.
         /// </para>
         /// </summary>
         public int? OriginReadTimeout
diff --git a/sdk/src/Services/CloudFront/Generated/_bcl/AmazonCloudFrontClient.cs b/sdk/src/Services/CloudFront/Generated/_bcl/AmazonCloudFrontClient.cs
diff --git a/sdk/src/Services/CloudFront/Generated/_bcl/IAmazonCloudFront.cs b/sdk/src/Services/CloudFront/Generated/_bcl/IAmazonCloudFront.cs
diff --git a/sdk/src/Services/CloudFront/Generated/_netstandard/AmazonCloudFrontClient.cs b/sdk/src/Services/CloudFront/Generated/_netstandard/AmazonCloudFrontClient.cs
diff --git a/sdk/src/Services/CloudFront/Generated/_netstandard/IAmazonCloudFront.cs b/sdk/src/Services/CloudFront/Generated/_netstandard/IAmazonCloudFront.cs
