Generate AbortMultipartUpload and CreateBucketMetadataTableConfiguration. Generate DeleteBucket and DeleteBucket related operations. Remove custom files.

Author: peterrsongg

generator/.DevConfigs/7064092c-4180-4624-a402-c6d354a1dfeb.json

@@ -4,7 +4,7 @@
             "serviceName": "S3",
             "type": "patch",
             "changeLogMessages": [
-                "Generate ListBuckets and ListDirectoryBuckets. Delete custom files."
+                "Generate DeleteBucket, DeleteBucketEncryption and related DeleteBucket operations. Delete relevant custom files."
             ]
         }
     ]

generator/ServiceClientGeneratorLib/Customizations.cs

@@ -1220,7 +1220,7 @@ public OperationModifiers GetOperationModifiers(string operationName)
             var data = _documentRoot[OperationModifiers.OperationModifiersKey];
             if (data == null)
                 return null;
-
+            
             var operation = data[operationName] as JsonData;
             if (operation == null)
                 return null;
@@ -1248,7 +1248,8 @@ public OperationModifiers GetOperationModifiers(string operationName)
                 modifiers.DeprecatedMessage = (string)operation[OperationModifiers.DeprecatedMessageKey];
             if (operation[OperationModifiers.StopPaginationOnSameTokenKey] != null && operation[OperationModifiers.StopPaginationOnSameTokenKey].IsBoolean)
                 modifiers.StopPaginationOnSameToken = (bool)operation[OperationModifiers.StopPaginationOnSameTokenKey];
-
+            if (operation[OperationModifiers.CustomizeMarshallerKey] != null && operation[OperationModifiers.CustomizeMarshallerKey].IsBoolean)
+                modifiers.CustomizeMarshaller = (bool)operation[OperationModifiers.CustomizeMarshallerKey];
             if (operation[OperationModifiers.MarshallNameOverrides] != null &&
                 operation[OperationModifiers.MarshallNameOverrides].IsArray)
             {
@@ -1315,13 +1316,30 @@ public class OperationModifiers
             public const string DeprecatedMessageKey = "deprecatedMessage";
             public const string DocumentationKey = "documentation";
             public const string StopPaginationOnSameTokenKey = "stopPaginationOnSameToken";
+            public const string CustomizeMarshallerKey = "customizeMarshaller";
 
             // within a marshal override for a shape; one or both may be present
             public const string MarshallLocationName = "marshallLocationName";
             public const string MarshallName = "marshallName";
 
             private Dictionary<string, JsonData> _marshallNameOverrides = null;
 
+            /// <summary>
+            /// Indicates if the operation's marshaller should be customized.
+            /// If set to true, the operation's marshaller will call CustomizeMarshaller();
+            /// which will be custom code for that specific marshaller.
+            ///usage:
+            /// customizeMarshaller
+            /// "DeleteBucket":{
+            ///    "customizeMarshaller": true
+            /// },  
+            /// </summary>
+            public bool CustomizeMarshaller
+            {
+                get;
+                set;
+            }
+
             /// <summary>
             /// The name of the operation modified
             /// </summary>

generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs

@@ -10,6 +10,15 @@
 	AddCommonUsingStatements();
 #>
 using System.Xml;
+<#
+	var operationModifiers = this.Config.ServiceModel.Customizations.GetOperationModifiers(this.Operation.Name);
+	if(this.Config.ServiceId == "S3" && operationModifiers != null && operationModifiers.CustomizeMarshaller)
+	{
+#>
+using Amazon.S3.Internal;
+<#
+	}
+#>
 
 #pragma warning disable CS0612,CS0618
 namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
@@ -38,6 +47,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 		{
 			var request = new DefaultRequest(publicRequest, "<#=this.Config.Namespace#>");
 <#
+
 	if ((this.Config.ServiceModel.H2Support == H2SupportDegree.Optional && this.Operation.IsEventStreamBidi) || (this.Config.ServiceModel.H2Support == H2SupportDegree.EventStream && this.Operation.IsEventStreamOutput) || this.Config.ServiceModel.H2Support == H2SupportDegree.Required)
 	{
 #>
@@ -116,7 +126,14 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 		ProcessEndpointHostPrefixMembers(3, "publicRequest", this.Operation);
 	}
 #>
-
+<#
+	if (operationModifiers != null && operationModifiers.CustomizeMarshaller)
+	{
+#>
+			request = CustomMarshallTransformations.Customize<#=this.Operation.Name#>Marshaller(request, publicRequest);
+<#
+	}
+#>
 			return request;
 		}
 <#				

generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt

@@ -469,17 +469,17 @@ public List<Operation> S3AllowListOperations
                 {
                     _s3AllowListOperations = new List<Operation>()
                     {
-                        //new Operation(this,"AbortMultipartUpload", DocumentRoot[OperationsKey]["AbortMultipartUpload"]),
-                        //new Operation(this,"CreateBucketMetadataTableConfiguration", DocumentRoot[OperationsKey]["CreateBucketMetadataTableConfiguration"]),
+                        new Operation(this,"AbortMultipartUpload", DocumentRoot[OperationsKey]["AbortMultipartUpload"]),
+                        new Operation(this,"CreateBucketMetadataTableConfiguration", DocumentRoot[OperationsKey]["CreateBucketMetadataTableConfiguration"]),
                         //new Operation(this, "CreateSession", DocumentRoot[OperationsKey]["CreateSession"]),
-                        //new Operation(this, "DeleteBucket", DocumentRoot[OperationsKey]["DeleteBucket"]),
-                        //new Operation(this, "DeleteBucketEncryption", DocumentRoot[OperationsKey]["DeleteBucketEncryption"]),
-                        //new Operation(this, "DeleteBucketMetadataTableConfiguration", DocumentRoot[OperationsKey]["DeleteBucketMetadataTableConfiguration"]),
-                        //new Operation(this, "DeleteBucketOwnershipControls", DocumentRoot[OperationsKey]["DeleteBucketOwnershipControls"]),
-                        //new Operation(this, "DeleteBucketPolicy", DocumentRoot[OperationsKey]["DeleteBucketPolicy"]),
-                        //new Operation(this, "DeleteBucketReplication", DocumentRoot[OperationsKey]["DeleteBucketReplication"]),
-                        //new Operation(this, "DeleteBucketTagging", DocumentRoot[OperationsKey]["DeleteBucketTagging"]),
-                        //new Operation(this, "DeletePublicAccessBlock", DocumentRoot[OperationsKey]["DeletePublicAccessBlock"]),
+                        new Operation(this, "DeleteBucket", DocumentRoot[OperationsKey]["DeleteBucket"]),
+                        new Operation(this, "DeleteBucketEncryption", DocumentRoot[OperationsKey]["DeleteBucketEncryption"]),
+                        new Operation(this, "DeleteBucketMetadataTableConfiguration", DocumentRoot[OperationsKey]["DeleteBucketMetadataTableConfiguration"]),
+                        new Operation(this, "DeleteBucketOwnershipControls", DocumentRoot[OperationsKey]["DeleteBucketOwnershipControls"]),
+                        new Operation(this, "DeleteBucketPolicy", DocumentRoot[OperationsKey]["DeleteBucketPolicy"]),
+                        new Operation(this, "DeleteBucketReplication", DocumentRoot[OperationsKey]["DeleteBucketReplication"]),
+                        new Operation(this, "DeleteBucketTagging", DocumentRoot[OperationsKey]["DeleteBucketTagging"]),
+                        new Operation(this, "DeletePublicAccessBlock", DocumentRoot[OperationsKey]["DeletePublicAccessBlock"]),
                         //new Operation(this, "GetBucketAccelerateConfiguration", DocumentRoot[OperationsKey]["GetBucketAccelerateConfiguration"]),
                         //new Operation(this, "GetBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["GetBucketAnalyticsConfiguration"]),
                         //new Operation(this, "GetBucketEncryption", DocumentRoot[OperationsKey]["GetBucketEncryption"]),

generator/ServiceClientGeneratorLib/ServiceModel.cs

@@ -245,6 +245,9 @@
         "CreateMultipartUpload": {
             "name": "InitiateMultipartUpload"
         },
+        "DeleteBucket":{
+            "customizeMarshaller": true
+        },
         "DeleteBucketCors": {
             "name": "DeleteCORSConfiguration"
         },

generator/ServiceModels/s3/s3.customizations.json

@@ -0,0 +1,47 @@
+using Amazon.Runtime.Internal;
+using Amazon.S3.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Amazon.S3.Internal
+{
+    /// <summary>
+    /// Class containing custom marshall transformations for S3.
+    /// Only meant for internal use.
+    /// </summary>
+    public static class CustomMarshallTransformations
+    {
+        /// <summary>
+        /// Custom Marshall transformation for default bucket request. Meant for internal usage only.
+        /// </summary>
+        /// <param name="defaultRequest"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public static DefaultRequest CustomizeDeleteBucketMarshaller(DefaultRequest defaultRequest, DeleteBucketRequest request)
+        {
+            if (request.BucketRegion != null)
+            {
+                RegionEndpoint regionEndpoint;
+#pragma warning disable CR1004
+                if (request.BucketRegion == S3Region.USEast1)
+                {
+                    regionEndpoint = RegionEndpoint.USEast1;
+                }
+                else if (request.BucketRegion == S3Region.EUWest1)
+                {
+                    regionEndpoint = RegionEndpoint.EUWest1;
+                }
+                else
+                {
+                    regionEndpoint = RegionEndpoint.GetBySystemName(request.BucketRegion.Value);
+                }
+#pragma warning restore CR1004
+                defaultRequest.AlternateEndpoint = regionEndpoint;
+            }
+            return defaultRequest;
+        }
+    }
+}