Adjustments to S3 RequestsWith200Error request list generation.

aws · Jan 6, 2025 · 4cb4246 · 4cb4246
1 parent 9a08624
commit 4cb4246
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 23 deletions.
diff --git a/generator/.DevConfigs/afb5e312-3d08-469e-a9c3-c392635eac53.json b/generator/.DevConfigs/afb5e312-3d08-469e-a9c3-c392635eac53.json
@@ -0,0 +1,11 @@
+{
+    "services": [
+        {
+            "serviceName": "S3",
+            "type": "patch",
+            "changeLogMessages": [
+                "Adjustments to S3 RequestsWith200Error request list generation."
+            ]
+        }
+    ]
+}
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AmazonS3RetryPolicy.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AmazonS3RetryPolicy.cs
@@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
     /// Class to produce the template output
     /// </summary>
 
-    #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
+    #line 1 "C:\Dev\worktrees\s3-200\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class AmazonS3RetryPolicy : BaseGenerator
     {
@@ -29,7 +29,7 @@ public partial class AmazonS3RetryPolicy : BaseGenerator
         public override string TransformText()
         {
 
-            #line 6 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
+            #line 6 "C:\Dev\worktrees\s3-200\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
 
 	AddLicenseHeader();
 
@@ -58,27 +58,35 @@ public partial class AmazonS3RetryPolicy : DefaultRetryPolicy
 		{
 ");
 
-            #line 29 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
+            #line 29 "C:\Dev\worktrees\s3-200\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
 
 
 	foreach(var operation in this.Config.ServiceModel.Operations)
 	{
-		if(operation.RequestStructure != null && !operation.RequestStructure.Members.Any(member => member.IsStreaming))
+		// List all operations without an output shape or an output shape that does not match any of the following conditions:
+		// "streaming":true
+		// "eventstream":true
+		// "payload" of type "string"
+		if((operation.ResponseStructure != null && 
+			!operation.ResponseStructure.Members.Any(member => member.IsStreaming || member.IsEventStream) &&
+			operation.ResponseStructure.PayloadMember?.OwningShape.IsString != true) ||
+			operation.ResponseStructure == null // When ResponseStructure is null the operation does not have an output shape.
+		)
 		{
 
 
             #line default
             #line hidden
             this.Write("\t\t\ttypeof(");
 
-            #line 36 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
+            #line 44 "C:\Dev\worktrees\s3-200\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(operation.Name));
 
             #line default
             #line hidden
             this.Write("Request),\r\n");
 
-            #line 37 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
+            #line 45 "C:\Dev\worktrees\s3-200\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AmazonS3RetryPolicy.tt"
 
 		}
 	}

diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AmazonS3RetryPolicy.tt b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AmazonS3RetryPolicy.tt
@@ -30,7 +30,15 @@ namespace Amazon.S3.Internal
 
 	foreach(var operation in this.Config.ServiceModel.Operations)
 	{
-		if(operation.RequestStructure != null && !operation.RequestStructure.Members.Any(member => member.IsStreaming))
+		// List all operations without an output shape or an output shape that does not match any of the following conditions:
+		// "streaming":true
+		// "eventstream":true
+		// "payload" of type "string"
+		if((operation.ResponseStructure != null && 
+			!operation.ResponseStructure.Members.Any(member => member.IsStreaming || member.IsEventStream) &&
+			operation.ResponseStructure.PayloadMember?.OwningShape.IsString != true) ||
+			operation.ResponseStructure == null // When ResponseStructure is null the operation does not have an output shape.
+		)
 		{
 #>
 			typeof(<#= operation.Name#>Request),

diff --git a/generator/ServiceClientGeneratorLib/Shape.cs b/generator/ServiceClientGeneratorLib/Shape.cs
@@ -433,20 +433,6 @@ public Member PayloadMember
             }
         }
 
-        public bool IsEventStream
-        {
-            get
-            {
-                var isEventStream = data[EventStreamKey];
-                if (isEventStream != null && isEventStream.IsBoolean)
-                {
-                    return (bool)isEventStream;
-                }
-
-                return false;
-            }
-        }
-
         /// <summary>
         /// If this shape is a primitive type this returns true so that the request can show if the member has been set or not
         /// </summary>

diff --git a/generator/ServiceClientGeneratorLib/SimpleModels.cs b/generator/ServiceClientGeneratorLib/SimpleModels.cs
@@ -78,6 +78,24 @@ public bool IsStreaming
             }
         }
 
+        /// <summary>
+        /// Determines if the given node has "eventstream": true which can be applied to a shape
+        /// or a member.
+        /// </summary>
+        public bool IsEventStream
+        {
+            get
+            {
+                var isEventStream = data[Shape.EventStreamKey];
+                if (isEventStream != null && isEventStream.IsBoolean)
+                {
+                    return (bool)isEventStream;
+                }
+
+                return false;
+            }
+        }
+
         /// <summary>
         /// If defined, specifies the namespace prefix the xml constructed
         /// </summary>

diff --git a/sdk/src/Services/S3/Generated/AmazonS3RetryPolicy.cs b/sdk/src/Services/S3/Generated/AmazonS3RetryPolicy.cs
@@ -81,14 +81,12 @@ public partial class AmazonS3RetryPolicy : DefaultRetryPolicy
             typeof(GetBucketWebsiteRequest),
             typeof(GetCORSConfigurationRequest),
             typeof(GetLifecycleConfigurationRequest),
-            typeof(GetObjectRequest),
             typeof(GetObjectAttributesRequest),
             typeof(GetObjectLegalHoldRequest),
             typeof(GetObjectLockConfigurationRequest),
             typeof(GetObjectMetadataRequest),
             typeof(GetObjectRetentionRequest),
             typeof(GetObjectTaggingRequest),
-            typeof(GetObjectTorrentRequest),
             typeof(GetPublicAccessBlockRequest),
             typeof(HeadBucketRequest),
             typeof(InitiateMultipartUploadRequest),
@@ -122,13 +120,16 @@ public partial class AmazonS3RetryPolicy : DefaultRetryPolicy
             typeof(PutBucketWebsiteRequest),
             typeof(PutCORSConfigurationRequest),
             typeof(PutLifecycleConfigurationRequest),
+            typeof(PutObjectRequest),
             typeof(PutObjectLegalHoldRequest),
             typeof(PutObjectLockConfigurationRequest),
             typeof(PutObjectRetentionRequest),
             typeof(PutObjectTaggingRequest),
             typeof(PutPublicAccessBlockRequest),
             typeof(RestoreObjectRequest),
             typeof(SelectObjectContentRequest),
+            typeof(UploadPartRequest),
+            typeof(WriteGetObjectResponseRequest),
         };
     }
 }