Generate GetBucketRequestPayment, GetBucketTagging,GetObjectAttributes, GetObjectLegalHold, GetObjectLockConfiguration, GetObjectRetention, GetObjectTagging, and GetPublicAccessBlock

* generate GetBucketRequestPayment, GetBucketTagging, GetObjectAttributes, GetObjectLegalHold, GetObjectLockConfiguration

* Generate GetObjectRetention and GetObjectTagging, GetPublicAccessBlock

* update devconfig

* address PR feedback

* update overrideTreatEnumsAsString customization

* Update value from true to false

* Add overrideTreatEnumsAsString logic to map as well

Author: peterrsongg

generator/.DevConfigs/816a028b-eb1b-4f17-9d9c-a0373bcd8ced.json

@@ -0,0 +1,11 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [
+        "Generate GetBucketRequestPayment, GetBucketTagging, and GetObjectAttributes, GetObjectLegalHold, GetObjectLockConfiguration, GetObjectRetention, GetObjectTagging, GetPublicAccessBlock"
+      ]
+    }
+  ]
+}

generator/ServiceClientGeneratorLib/Customizations.cs

@@ -424,7 +424,7 @@ public class CustomizationsModel
         public const string OverrideContentTypeKey = "overrideContentType";
         public const string StopPaginationOnSameTokenKey = "stopPaginationOnSameToken";
         public const string OriginalMemberKey = "originalMember";
-
+        public const string OverrideTreatEnumsAsStringKey = "overrideTreatEnumsAsString";
         JsonData _documentRoot;
 
         SimpleMethodFormsModel _simpleMethodsModel;
@@ -600,6 +600,24 @@ public List<string> NoArgOverloads
             }
         }
 
+        /// <summary>
+        /// For Lists of enums, the generator automatically treats the enum as a string via passing in true to "treatEnumAsString".
+        /// This customization sets the "treatEnumAsString" value to whatever is set here. This can be used outside of list of enums
+        /// but this is just one example of how it can be used. 
+        ///     "overrideTreatEnumsAsString":{
+        ///        "ObjectAttributesList": false
+        /// }
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        public bool? OverrideTreatEnumsAsString(string shapeName)
+        {
+            var data = _documentRoot[OverrideTreatEnumsAsStringKey];
+            if (data == null || data[shapeName] == null) return null;
+
+            return (bool)data[shapeName];
+        }
+
         private HashSet<string> _resultGenerationSuppressions = null;
 
         /// <summary>

generator/ServiceClientGeneratorLib/GeneratorDriver.cs

@@ -211,7 +211,6 @@ public void Execute()
                 this.ExecuteGenerator(new ServiceEnumerations(), enumFileName);
             }
 
-          
             // Any paginators for the service
             // skip paginators for s3 until we're at the end of s3 client generation
             if (Configuration.ServiceModel.HasPaginators && Configuration.ServiceId != "S3")

generator/ServiceClientGeneratorLib/Member.cs

@@ -579,11 +579,13 @@ private string DetermineType(JsonData extendedData, bool treatEnumsAsString, boo
                     }
                     return typeName;
                 case "map":
-                    var keyType = DetermineType(memberShape["key"], true, false);
-                    var valueType = DetermineType(memberShape["value"], true, false);
+                    bool overrideMapTreatEnumsAsString = this.model.Customizations.OverrideTreatEnumsAsString(this.Extends) ?? true;
+                    var keyType = DetermineType(memberShape["key"], overrideMapTreatEnumsAsString, false);
+                    var valueType = DetermineType(memberShape["value"], overrideMapTreatEnumsAsString, false);
                     return string.Format("Dictionary<{0}, {1}>", keyType, valueType);
                 case "list":
-                    var listType = DetermineType(memberShape["member"], true, false);
+                    bool overrideListTreatEnumsAsString = this.model.Customizations.OverrideTreatEnumsAsString(this.Extends) ?? true;
+                    var listType = DetermineType(memberShape["member"], overrideListTreatEnumsAsString, false);
                     return string.Format("List<{0}>", listType);
 
                 case "decimal":

generator/ServiceClientGeneratorLib/ServiceModel.cs

@@ -493,16 +493,16 @@ public List<Operation> S3AllowListOperations
                         new Operation(this, "GetBucketPolicy", DocumentRoot[OperationsKey]["GetBucketPolicy"]),
                         new Operation(this, "GetBucketPolicyStatus", DocumentRoot[OperationsKey]["GetBucketPolicyStatus"]),
                         new Operation(this, "GetBucketReplication", DocumentRoot[OperationsKey]["GetBucketReplication"]),
-                        //new Operation(this, "GetBucketRequestPayment", DocumentRoot[OperationsKey]["GetBucketRequestPayment"]),
-                        //new Operation(this, "GetBucketTagging", DocumentRoot[OperationsKey]["GetBucketTagging"]),
+                        new Operation(this, "GetBucketRequestPayment", DocumentRoot[OperationsKey]["GetBucketRequestPayment"]),
+                        new Operation(this, "GetBucketTagging", DocumentRoot[OperationsKey]["GetBucketTagging"]),
                         //new Operation(this, "GetBucketVersioning", DocumentRoot[OperationsKey]["GetBucketVersioning"]),
                         //new Operation(this, "GetBucketWebsite", DocumentRoot[OperationsKey]["GetBucketWebsite"]),
-                        //new Operation(this, "GetObjectAttributes", DocumentRoot[OperationsKey]["GetObjectAttributes"]),
-                        //new Operation(this, "GetObjectLegalHold", DocumentRoot[OperationsKey]["GetObjectLegalHold"]),
-                        //new Operation(this, "GetObjectLockConfiguration", DocumentRoot[OperationsKey]["GetObjectLockConfiguration"]),
-                        //new Operation(this, "GetObjectRetention", DocumentRoot[OperationsKey]["GetObjectRetention"]),
-                        //new Operation(this, "GetObjectTagging", DocumentRoot[OperationsKey]["GetObjectTagging"]),
-                        //new Operation(this, "GetPublicAccessBlock", DocumentRoot[OperationsKey]["GetPublicAccessBlock"]),
+                        new Operation(this, "GetObjectAttributes", DocumentRoot[OperationsKey]["GetObjectAttributes"]),
+                        new Operation(this, "GetObjectLegalHold", DocumentRoot[OperationsKey]["GetObjectLegalHold"]),
+                        new Operation(this, "GetObjectLockConfiguration", DocumentRoot[OperationsKey]["GetObjectLockConfiguration"]),
+                        new Operation(this, "GetObjectRetention", DocumentRoot[OperationsKey]["GetObjectRetention"]),
+                        new Operation(this, "GetObjectTagging", DocumentRoot[OperationsKey]["GetObjectTagging"]),
+                        new Operation(this, "GetPublicAccessBlock", DocumentRoot[OperationsKey]["GetPublicAccessBlock"]),
                         //new Operation(this, "HeadBucket", DocumentRoot[OperationsKey]["HeadBucket"]),
                         //new Operation(this, "ListBucketAnalyticsConfigurations", DocumentRoot[OperationsKey]["ListBucketAnalyticsConfigurations"]),
                         //new Operation(this, "ListBucketIntelligentTieringConfigurations", DocumentRoot[OperationsKey]["ListBucketIntelligentTieringConfigurations"]),
@@ -542,7 +542,9 @@ public List<string> S3AddParametersList
                     _s3AddParametersList = new List<string>
                     {
                         "ListBuckets",
-                        "ListDirectoryBuckets"
+                        "ListDirectoryBuckets",
+                        "GetObjectLegalHold",
+                        "GetObjectRetention"
                     };
                 }
                 return _s3AddParametersList;
@@ -567,7 +569,8 @@ public List<string> S3RequestMarshallerThrowGenericExceptionList
                 {
                     _s3RequestMarshallerThrowAmazonS3ExceptionList = new List<string>()
                     {
-                        "CreateSession"
+                        "CreateSession",
+                        "GetObjectAttributes"
                     };
                 }
                 return _s3RequestMarshallerThrowAmazonS3ExceptionList;

generator/ServiceModels/s3/s3.customizations.json

@@ -137,6 +137,13 @@
                 }
             ]
         },
+        "GetObjectTaggingOutput":{
+            "modify":[
+                {
+                    "TagSet": {"emitPropertyName": "Tagging"}
+                }
+            ]
+        },
         "LifecycleRule": {
             "modify": [
                 {
@@ -381,6 +388,13 @@
         },
         "StorageClass":{
             "renameShape": "S3StorageClass"
+        },
+        "Payer":{
+            "renameShape": "string"
         }
+
+    },
+    "overrideTreatEnumsAsString":{
+        "ObjectAttributesList": false
     }
 }