Fix issue #3989. If an empty filter was specified, GetLifecycleConfiguration was failing. This fix allows an empty filter to be specified when retrieving lifecycle configurations via GetLifecycleConfiguration (#3990)

Author: peterrsongg

generator/.DevConfigs/69493830-939a-47ba-ae94-e9ae35de6475.json

@@ -0,0 +1,11 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [
+        "Fix issue #3989. If an empty filter was specified, GetLifecycleConfiguration was failing. This fix allows an empty filter to be specified when retrieving lifecycle configurations via GetLifecycleConfiguration."
+      ]
+    }
+  ]
+}

generator/ServiceModels/s3/s3.customizations.json

@@ -171,14 +171,12 @@
                             "private LifecycleRuleStatus _status = LifecycleRuleStatus.Disabled;"
                         ]
                     }
-                }
-            ],
-            "predicateListUnmarshallers":[
+                },
                 {
                     "Filter": 
                     {
-                        "predicateListUnmarshallerName": "LifecycleFilterPredicateListUnmarshaller",
-                        "filterPredicateName": "LifecycleFilterPredicate"
+                        "skipContextTestExpressionUnmarshallingLogic" : true,
+                        "injectXmlUnmarshallCode": ["FilterCustomUnmarshall(context, unmarshalledObject);"]
                     }
                 }
             ]

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/LifecycleRuleUnmarshaller.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Xml.Serialization;
+
+using Amazon.S3.Model;
+using Amazon.Runtime;
+using Amazon.Runtime.Internal;
+using Amazon.Runtime.Internal.Transform;
+using Amazon.Runtime.Internal.Util;
+
+#pragma warning disable CS0612,CS0618
+namespace Amazon.S3.Model.Internal.MarshallTransformations
+{
+    public partial class LifecycleRuleUnmarshaller : IXmlUnmarshaller<LifecycleRule, XmlUnmarshallerContext>
+    {
+        private static void FilterCustomUnmarshall(XmlUnmarshallerContext context, LifecycleRule rule)
+        {
+            var predicateList = LifecycleFilterPredicateListUnmarshaller.Instance.Unmarshall(context);
+
+            if (predicateList.Count == 1)
+            {
+                rule.Filter = new LifecycleFilter()
+                {
+                    LifecycleFilterPredicate = predicateList[0]
+                };
+            }
+            else if (predicateList.Count > 1)
+            {
+                var requestId = context.ResponseData.GetHeaderValue("x-amzn-RequestId");
+                var message = "The Filter element must contain at most one 'Prefix', 'Tag', or 'And' predicate.";
+                throw new AmazonUnmarshallingException(requestId, context.CurrentPath, context.ResponseBody, message, null);
+            }
+            return;
+        }
+    }
+}

sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/LifecycleRuleUnmarshaller.cs

@@ -70,9 +70,7 @@ public LifecycleRule Unmarshall(XmlUnmarshallerContext context)
                     }
                     if (context.TestExpression("Filter", targetDepth))
                     {
-                        var predicateList = LifecycleFilterPredicateListUnmarshaller.Instance.Unmarshall(context);
-                        unmarshalledObject.Filter = new LifecycleFilter();
-                        unmarshalledObject.Filter.LifecycleFilterPredicate = predicateList[0];
+                        FilterCustomUnmarshall(context, unmarshalledObject);
                         continue;
                     }
                     if (context.TestExpression("ID", targetDepth))

sdk/test/Services/S3/IntegrationTests/LifecycleTests.cs

@@ -13,23 +13,23 @@
  * permissions and limitations under the License.
  */
 
+using Amazon;
+using Amazon.Runtime;
+using Amazon.S3;
+using Amazon.S3.Model;
+using Amazon.S3.Util;
+using AWSSDK_DotNet.IntegrationTests.Tests;
+using AWSSDK_DotNet.IntegrationTests.Tests.S3;
+using AWSSDK_DotNet.IntegrationTests.Utils;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-using Amazon.Runtime;
-using Amazon.S3;
-using Amazon.S3.Model;
-using AWSSDK_DotNet.IntegrationTests.Tests;
-using AWSSDK_DotNet.IntegrationTests.Tests.S3;
-using Amazon.S3.Util;
-using AWSSDK_DotNet.IntegrationTests.Utils;
-using Amazon;
 
 namespace S3UnitTest
 {
@@ -79,6 +79,43 @@ public void Cleanup()
                 AmazonS3Util.DeleteS3BucketWithObjects(Client, bucketName);
         }
 
+        [TestMethod]
+        [TestCategory("S3")]
+        public void LifecycleEmptyFilterTest()
+        {
+            var s3Configuration = new LifecycleConfiguration
+            {
+                Rules = new List<LifecycleRule>
+                    {
+                        new LifecycleRule
+                        {
+                            Id = "Empty-filter-test",
+                            Filter = new LifecycleFilter{},
+                            Expiration = new LifecycleRuleExpiration
+                            {
+                                Days = 30
+                            }
+                        },
+                    }
+            };
+            Client.PutLifecycleConfiguration(new PutLifecycleConfigurationRequest
+            {
+                BucketName = bucketName,
+                Configuration = s3Configuration
+            });
+
+            var configuration = S3TestUtils.WaitForConsistency(() =>
+            {
+                var res = Client.GetLifecycleConfiguration(bucketName);
+                return res.Configuration?.Rules?.Count == s3Configuration.Rules.Count ? res.Configuration : null;
+            });
+
+            Assert.AreEqual<string>(configuration.Rules.First().Id, "Empty-filter-test");
+            Assert.AreEqual<int?>(configuration.Rules.First().Expiration.Days, 30);
+        }
+
+
+
         [TestMethod]
         [TestCategory("S3")]
         public void LifecycleTest()