Generate AbortMultipartUpload, CreateBucketMetadataTableConfiguration and DeleteBucket related operations. (#3870)

* Generate Listbuckets and ListDirectoryBuckets

* Generate more s3 operations, add new customizemarshaller partial method for rest xml marshallers

* change customizemarshaller to postmarshallcustomization

* Add back dependencies accidentally removed in previous commit for generator

* update devconfig

* rerun structuregenerator.tt file to generate cs file

Author: peterrsongg

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

@@ -0,0 +1,18 @@
+{  
+  "core": {
+    "changeLogMessages": [
+      "Generate PostMarshallCustomization partial method and make marshallers partial classes for rest-xml protocol services"
+    ],
+    "type": "patch",
+    "updateMinimum": true
+  },
+    "services": [
+        {
+            "serviceName": "S3",
+            "type": "patch",
+            "changeLogMessages": [
+                "Generate DeleteBucket, DeleteBucketEncryption and related DeleteBucket operations. Generated AbortMultipartUpload and CreateBucketMetadataTableConfiguration. 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,6 @@ 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.MarshallNameOverrides] != null &&
                 operation[OperationModifiers.MarshallNameOverrides].IsArray)
             {

generator/ServiceClientGeneratorLib/GeneratorDriver.cs

@@ -237,7 +237,7 @@ public void Execute()
             }
 
             var operations = Configuration.Namespace == "Amazon.S3" ? Configuration.ServiceModel.S3AllowListOperations : Configuration.ServiceModel.Operations;
-            // Generates the Request, Response, Marshaller, Unmarshaller, and Exception objects for a given client operation
+
             foreach (var operation in operations)
             {
                 GenerateRequest(operation);
@@ -249,6 +249,8 @@ public void Execute()
                 GenerateStructures(operation);
                 GenerateEventStreamPublisher(operation);
             }
+                // Generates the Request, Response, Marshaller, Unmarshaller, and Exception objects for a given client operation
+
 
             if (Configuration.ServiceModel.Customizations.GenerateCustomUnmarshaller)
             {

generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs

@@ -17,7 +17,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 	/// <summary>
 	/// <#=this.Operation.Name #> Request Marshaller
 	/// </summary>       
-	public class <#=this.Operation.Name#>RequestMarshaller : IMarshaller<IRequest, <#=this.Operation.Name#>Request> , IMarshaller<IRequest,AmazonWebServiceRequest>
+	public partial class <#=this.Operation.Name#>RequestMarshaller : IMarshaller<IRequest, <#=this.Operation.Name#>Request> , IMarshaller<IRequest,AmazonWebServiceRequest>
 	{
         /// <summary>
         /// Marshaller the request object to the HTTP request.
@@ -38,6 +38,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)
 	{
 #>
@@ -65,9 +66,26 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 	ProcessHeaderMembers("publicRequest", this.Operation.RequestHeaderMembers);		
 	ProcessUriMembers("publicRequest", this.Operation);	
 	ProcessQueryStringMembers("publicRequest", this.Operation);
+	if (this.Config.ServiceId == "S3")
+	{
+		// even though RequestUri contains the bucket name in s3. In reality, the bucket Name
+		// is part of the endpoint so we remove it.
+		string resourcePath = string.Empty;
+		if (this.Operation.RequestUri.StartsWith("/{Bucket}"))
+			resourcePath = this.Operation.RequestUri.Substring(9).Length == 0 ? "/" :  this.Operation.RequestUri.Substring(9);
+		else
+			resourcePath = this.Operation.RequestUri;
+#>
+			request.ResourcePath = "<#=resourcePath#>";
+<#
+	}
+	else
+	{
 #>
 			request.ResourcePath = "<#=this.Operation.RequestUri #>";
+
 <#   
+	}
 	// Process any members which are marshalled as part of the request body
 	if(this.Operation.RequestHasBodyMembers || shouldMarshallPayload)
 	{
@@ -99,12 +117,13 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 		ProcessEndpointHostPrefixMembers(3, "publicRequest", this.Operation);
 	}
 #>
-
+			PostMarshallCustomization(request, publicRequest);
 			return request;
 		}
 <#				
 	this.AddRequestSingletonMethod();
 #>
+		partial void PostMarshallCustomization(DefaultRequest defaultRequest, <#=this.Operation.Name#>Request publicRequest);
 	}	
 }