content language bug fix

stack-info: PR: #4224, branch: GarrettBeatty/gcbeatty/taskoptimization/5

Author: GarrettBeatty

sdk/src/Core/Amazon.Runtime/Pipeline/HttpHandler/_netstandard/HttpRequestMessageFactory.cs

@@ -400,6 +400,7 @@ public class HttpWebRequestMessage : IHttpRequest<HttpContent>
             HeaderKeys.ContentRangeHeader,
             HeaderKeys.ContentMD5Header,
             HeaderKeys.ContentEncodingHeader,
+            HeaderKeys.ContentLanguageHeader,
             HeaderKeys.ContentDispositionHeader,
             HeaderKeys.Expires
         };
@@ -731,6 +732,10 @@ private void WriteContentHeaders(IDictionary<string, string> contentHeaders)
                 _request.Content.Headers.TryAddWithoutValidation(HeaderKeys.ContentEncodingHeader,
                     contentEncodingHeader);
 
+            if (contentHeaders.TryGetValue(HeaderKeys.ContentLanguageHeader, out var contentLanguageHeader))
+                _request.Content.Headers.TryAddWithoutValidation(HeaderKeys.ContentLanguageHeader,
+                    contentLanguageHeader);
+
             if (contentHeaders.TryGetValue(HeaderKeys.ContentDispositionHeader, out var contentDispositionHeader))
                 _request.Content.Headers.TryAddWithoutValidation(HeaderKeys.ContentDispositionHeader,
                     contentDispositionHeader);

sdk/src/Core/Amazon.Util/HeaderKeys.cs

@@ -37,6 +37,7 @@ public abstract class HeaderKeys
         public const string ContentMD5Header = "Content-MD5";
         public const string ContentEncodingHeader = "Content-Encoding";
         public const string ContentDispositionHeader = "Content-Disposition";
+        public const string ContentLanguageHeader = "Content-Language";
         public const string ETagHeader = "ETag";
         public const string Expires = "Expires";
         public const string AuthorizationHeader = "Authorization";

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

@@ -628,6 +628,38 @@ public void PutObjectWithContentEncodingTests()
             PutObjectWithoutContentEncoding();
         }
 
+        [TestMethod]
+        [TestCategory("S3")]
+        public void TestPutObjectWithContentLanguage()
+        {
+            var key = "contentLanguageTest" + random.Next();
+            var contentLanguage = "en-US";
+            
+            var request = new PutObjectRequest
+            {
+                BucketName = bucketName,
+                Key = key,
+                ContentBody = testContent
+            };
+            request.Headers.ContentLanguage = contentLanguage;
+            
+            // Put the object
+            var putResponse = Client.PutObject(request);
+            Assert.IsTrue(putResponse.ETag.Length > 0);
+            
+            // Verify via GetObject
+            using (var getResponse = Client.GetObject(bucketName, key))
+            {
+                Assert.AreEqual(contentLanguage, getResponse.Headers.ContentLanguage);
+                Assert.AreEqual(contentLanguage, getResponse.ContentLanguage);
+
+            }
+            
+            // Verify via GetObjectMetadata
+            var metadata = Client.GetObjectMetadata(bucketName, key);
+            Assert.AreEqual(contentLanguage, metadata.Headers.ContentLanguage);
+        }
+
         private void PutObjectWithContentEncoding()
         {
             var request = CreatePutObjectRequest();
@@ -1538,4 +1570,4 @@ public override bool CanSeek
             }
         }
     }
-}
+}