Merge PR for 4 more S3 operations

generator/.DevConfigs/0c5568ff-1b20-4cd6-a5cf-2e676424569a.json

@@ -0,0 +1,13 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [
+        "Generate 4 more S3 operations.PutBucketIntelligentTieringConfiguration, GetBucketIntelligentTieringConfiguration.ListBucketIntelligentTieringConfigurations, and DeleteBucketIntelligentTieringConfiguration.",
+        "Fix a bug where calling GetBucketIntelligentTiering with no IntelligentTieringId would call ListBucketIntelligentTieringConfigurations. Now, calling GetBucketIntelligentTiering with no IntelligentTieringId will throw an exception.",
+        "[Breaking Change] IsSetIntelligentTieringConfigurationList() on ListBucketIntelligentTieringConfigurationsResponse changed from public to internal to follow other IsSet methods."
+      ]
+    }
+  ]
+}

generator/ServiceClientGeneratorLib/GeneratorDriver.cs

@@ -1719,8 +1719,13 @@ private void S3NeedsCustomUpdate(Shape shape)
             // a dictionary of shape name to number of members that shape has
             var customUpdateShapes = new Dictionary<string, int>
             {
-                {"LifecycleFilter", 5 },
-                {"MetricsFilter", 4 }
+                { "LifecycleFilter", 5 },
+                { "MetricsFilter", 4 },
+                { "AnalyticsFilter", 3 },
+                { "IntelligentTieringFilter", 3 },
+                { "MetricsAndOperator", 3 },
+                { "AnalyticsAndOperator", 2 },
+                { "IntelligentTieringAndOperator", 2}
             };
             if (customUpdateShapes.TryGetValue(shape.Name, out int membersCount))
             {

generator/ServiceClientGeneratorLib/ServiceModel.cs

@@ -551,26 +551,26 @@ public List<Operation> S3AllowListOperations
                         // phase 3 (including those moved from phase 1)
                         new Operation(this, "CreateSession", DocumentRoot[OperationsKey]["CreateSession"]),
                         new Operation(this, "GetBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["GetBucketAnalyticsConfiguration"]),
-						//new Operation(this, "GetBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["GetBucketIntelligentTieringConfiguration"]),
+                        new Operation(this, "GetBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["GetBucketIntelligentTieringConfiguration"]),
                         //new Operation(this, "GetBucketInventoryConfiguration", DocumentRoot[OperationsKey]["GetBucketInventoryConfiguration"]),
 						//new Operation(this, "GetBucketLogging", DocumentRoot[OperationsKey]["GetBucketLogging"]),
 						new Operation(this, "GetBucketMetricsConfiguration", DocumentRoot[OperationsKey]["GetBucketMetricsConfiguration"]),
 						//new Operation(this, "GetBucketVersioning", DocumentRoot[OperationsKey]["GetBucketVersioning"]),
                         //new Operation(this, "GetBucketWebsite", DocumentRoot[OperationsKey]["GetBucketWebsite"]),
 						new Operation(this, "ListBucketAnalyticsConfigurations", DocumentRoot[OperationsKey]["ListBucketAnalyticsConfigurations"]),
-                        //new Operation(this, "ListBucketIntelligentTieringConfigurations", DocumentRoot[OperationsKey]["ListBucketIntelligentTieringConfigurations"]),
+                        new Operation(this, "ListBucketIntelligentTieringConfigurations", DocumentRoot[OperationsKey]["ListBucketIntelligentTieringConfigurations"]),
                         //new Operation(this, "ListBucketInventoryConfigurations", DocumentRoot[OperationsKey]["ListBucketInventoryConfigurations"]),
                         new Operation(this, "ListBucketMetricsConfigurations", DocumentRoot[OperationsKey]["ListBucketMetricsConfigurations"]),
 						//new Operation(this, "PutBucketAccelerateConfiguration", DocumentRoot[OperationsKey]["PutBucketAccelerateConfiguration"]),
 						//new Operation(this, "RestoreObject", DocumentRoot[OperationsKey]["RestoreObject"]),
                         //new Operation(this, "SelectObjectContent", DocumentRoot[OperationsKey]["SelectObjectContent"]),
                         new Operation(this, "PutBucketAnalyticsConfiguration" , DocumentRoot[OperationsKey]["PutBucketAnalyticsConfiguration"]),
-                        //new Operation(this, "PutBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["PutBucketIntelligentTieringConfiguration"]),
+                        new Operation(this, "PutBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["PutBucketIntelligentTieringConfiguration"]),
                         //new Operation(this, "PutBucketInventoryConfiguration", DocumentRoot[OperationsKey]["PutBucketInventoryConfiguration"]),
                         new Operation(this, "PutBucketMetricsConfiguration", DocumentRoot[OperationsKey]["PutBucketMetricsConfiguration"]),
                         new Operation(this, "DeleteBucketMetricsConfiguration", DocumentRoot[OperationsKey]["DeleteBucketMetricsConfiguration"]),
                         new Operation(this, "DeleteBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["DeleteBucketAnalyticsConfiguration"]),
-                        //new Operation(this, "DeleteBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["DeleteBucketIntelligentTieringConfiguration"]),
+                        new Operation(this, "DeleteBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["DeleteBucketIntelligentTieringConfiguration"]),
                         //new Operation(this, "DeleteBucketInventoryConfiguration", DocumentRoot[OperationsKey]["DeleteBucketInventoryConfiguration"]),
 
                     };

generator/ServiceModels/s3/s3.customizations.json

@@ -1007,6 +1007,75 @@
                     ]}
                 }
             ]
+        },
+        "PutBucketIntelligentTieringConfigurationRequest" : {
+            "modify" : [
+                {
+                    "Id": {"emitPropertyName": "IntelligentTieringId"}
+                }
+            ]
+        },
+        "IntelligentTieringConfiguration" : {
+            "modify": [
+                {
+                    "Id" :{"emitPropertyName":"IntelligentTieringId"}
+                },
+                {
+                    "Filter": {"emitPropertyName": "IntelligentTieringFilter"}
+                },
+                {                   
+                    "IntelligentTieringFilter" :{
+                        "injectXmlMarshallCode": ["IntelligentTieringFilterCustomMarshall(publicRequest, xmlWriter);"]
+                    }
+                }
+            ],
+            "predicateListUnmarshallers": [
+                {
+                    "IntelligentTieringFilter" :{
+                        "predicateListUnmarshallerName" : "IntelligentTieringPredicateListFilterUnmarshaller",
+                        "filterPredicateName": "IntelligentTieringFilterPredicate"
+                    }
+                }
+            ]
+        },
+        "GetBucketIntelligentTieringConfigurationRequest":{
+            "modify":[
+                {
+                    "Id" : {"emitPropertyName": "IntelligentTieringId"}
+                }
+            ]
+        },
+        "ListBucketIntelligentTieringConfigurationsRequest":{
+            "modify":[
+                {
+                    "ContinuationToken":{
+                        "injectXmlIsSet":[
+                            "return !string.IsNullOrEmpty(this._continuationToken);"
+                        ]
+                    }
+                }
+            ]
+        },
+        "ListBucketIntelligentTieringConfigurationsOutput":{
+            "modify":[
+                {
+                    "ContinuationToken":{
+                        "injectXmlIsSet":[ "return !string.IsNullOrEmpty(this._continuationToken);"]
+                    }
+                },
+                {
+                    "NextContinuationToken":{
+                        "injectXmlIsSet":["return !string.IsNullOrEmpty(this._nextContinuationToken);"]
+                    }
+                }
+            ]
+        },
+        "DeleteBucketIntelligentTieringConfigurationRequest":{
+            "modify":[
+                {
+                    "Id":{"emitPropertyName": "IntelligentTieringId"}
+                }
+            ]
         }
     },
     "operationModifiers": {
@@ -1381,6 +1450,8 @@
         "MetricsFilter",
         "MetricsAndOperator",
         "AnalyticsFilter",
-        "AnalyticsAndOperator"
+        "AnalyticsAndOperator",
+        "IntelligentTieringFilter",
+        "IntelligentTieringAndOperator"
     ]
 }