fix(cli): stabilize daemon tests across platforms

Signed-off-by: Will Killian <wkillian@nvidia.com>

Author: willkill07

ATTRIBUTIONS-Rust.md

@@ -18304,7 +18304,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ```
 
-## h2 - 0.4.16
+## h2 - 0.4.19
 **Repository URL**: https://github.com/hyperium/h2
 **License Type(s)**: MIT
 ### License: https://spdx.org/licenses/MIT.html

Cargo.lock

@@ -507,12 +507,12 @@ fn render_pi(spec: &ManagedBundleSpec) -> Result<Vec<RenderedArtifact>, CliError
         artifact(
             ManagedAgent::Pi,
             "pi/extension-v1/README.md",
-            include_bytes!("pi_extension/README.md").to_vec(),
+            canonical_embedded_text(include_str!("pi_extension/README.md")).into_bytes(),
         ),
         artifact(
             ManagedAgent::Pi,
             "pi/extension-v1/index.ts",
-            include_bytes!("pi_extension/index.ts").to_vec(),
+            canonical_embedded_text(include_str!("pi_extension/index.ts")).into_bytes(),
         ),
         artifact(
             ManagedAgent::Pi,
@@ -522,20 +522,20 @@ fn render_pi(spec: &ManagedBundleSpec) -> Result<Vec<RenderedArtifact>, CliError
         artifact(
             ManagedAgent::Pi,
             "pi/extension-v1/package.json",
-            include_bytes!("pi_extension/package.json").to_vec(),
+            canonical_embedded_text(include_str!("pi_extension/package.json")).into_bytes(),
         ),
         artifact(
             ManagedAgent::Pi,
             "pi/extension-v1/tsconfig.json",
-            include_bytes!("pi_extension/tsconfig.json").to_vec(),
+            canonical_embedded_text(include_str!("pi_extension/tsconfig.json")).into_bytes(),
         ),
     ])
 }
 
 fn render_pi_config(spec: &ManagedBundleSpec) -> Result<Vec<u8>, CliError> {
-    let template = include_str!("pi_extension/managed-config.json");
+    let template = canonical_embedded_text(include_str!("pi_extension/managed-config.json"));
     let rendered = replace_json_string_value(
-        template,
+        &template,
         PI_DAEMON_ADDRESS_PLACEHOLDER,
         &spec.daemon_address,
     )?;
@@ -557,6 +557,10 @@ fn render_pi_config(spec: &ManagedBundleSpec) -> Result<Vec<u8>, CliError> {
     Ok(rendered.into_bytes())
 }
 
+fn canonical_embedded_text(template: &str) -> String {
+    template.replace("\r\n", "\n")
+}
+
 fn replace_json_string_value(
     template: &str,
     placeholder: &str,

crates/cli/src/daemon/managed/mod.rs

@@ -271,6 +271,18 @@ fn canonical_v1_bundle_matches_the_release_frozen_golden_digest() {
     assert_eq!(rendered_bundle_digest(&rendered).to_string(), GOLDEN_SHA256);
 }
 
+#[test]
+fn embedded_managed_text_has_platform_independent_line_endings() {
+    assert_eq!(
+        canonical_embedded_text("first\r\nsecond\r\n"),
+        "first\nsecond\n"
+    );
+    assert_eq!(
+        canonical_embedded_text("first\nsecond\n"),
+        "first\nsecond\n"
+    );
+}
+
 #[test]
 fn write_is_create_only_and_existing_exact_bundle_is_not_rewritten() {
     let directory = tempdir().unwrap();