Merge branch 'main' into docker-update

Author: roypat

CHANGELOG.md

@@ -31,6 +31,10 @@ and this project adheres to
 
 - [#5222](https://github.com/firecracker-microvm/firecracker/pull/5222): Fixed
   network and rng devices locking up on hosts with non 4K pages.
+- [#5226](https://github.com/firecracker-microvm/firecracker/pull/5226): Fixed
+  MMDS to set `Content-Type` header correctly (i.e. `Content-Type: text/plain`
+  for IMDS-formatted or error responses and `Content-Type: application/json` for
+  JSON-formatted responses).
 
 ## [1.12.0]
 

src/vmm/src/mmds/data_store.rs

@@ -352,7 +352,8 @@ mod tests {
             ],
             "member": false,
             "shares_percentage": 12.12,
-            "balance": -24
+            "balance": -24,
+            "json_string": "{\n  \"hello\": \"world\"\n}"
         }"#;
         let data_store: Value = serde_json::from_str(data).unwrap();
         mmds.put_data(data_store).unwrap();
@@ -492,6 +493,18 @@ mod tests {
                 .to_string(),
             MmdsDatastoreError::UnsupportedValueType.to_string()
         );
+
+        // Retrieve a string including escapes.
+        assert_eq!(
+            mmds.get_value("/json_string".to_string(), OutputFormat::Json)
+                .unwrap(),
+            r#""{\n  \"hello\": \"world\"\n}""#
+        );
+        assert_eq!(
+            mmds.get_value("/json_string".to_string(), OutputFormat::Imds)
+                .unwrap(),
+            "{\n  \"hello\": \"world\"\n}"
+        )
     }
 
     #[test]