for composite control plane artifacts, define both artifact name and file name (#33)

In oxidecomputer/omicron#8514 we found that the
artifact and file names don't actually match all the time. With this
change, both the artifact and the file name will have to be specified.

oxidecomputer/omicron#8510 is the issue that
tracks cleaning this up.

Author: sunshowers

bin/invalid-manifests/duplicate-zone.toml …-manifests/duplicate-zone-file-name.tomlbin/invalid-manifests/duplicate-zone.toml renamed to bin/invalid-manifests/duplicate-zone-file-name.toml bin/invalid-manifests/duplicate-zone.toml renamed to bin/invalid-manifests/duplicate-zone-file-name.toml

@@ -9,6 +9,6 @@ version = "1.0.0"
 [artifact.control_plane.source]
 kind = "composite-control-plane"
 zones = [
-    { kind = "fake", name = "zone1", size = "1MiB" },
-    { kind = "fake", name = "zone1", size = "1MiB" },
+    { kind = "fake", artifact_name = "zone-1", file_name = "zone1.tar.gz", size = "1MiB" },
+    { kind = "fake", artifact_name = "zone-1", file_name = "zone1-dup.tar.gz", size = "1MiB" },
 ]

bin/manifests/fake-non-semver.toml

@@ -41,8 +41,8 @@ version = "2.0.0"
 [artifact.control_plane.source]
 kind = "composite-control-plane"
 zones = [
-    { kind = "fake", name = "zone1", size = "1MiB" },
-    { kind = "fake", name = "zone2", size = "1MiB" },
+    { kind = "fake", artifact_name = "zone-1", file_name = "zone1.tar.gz", size = "1MiB" },
+    { kind = "fake", artifact_name = "zone-2", file_name = "zone2.tar.gz", size = "1MiB" },
 ]
 
 [[artifact.psc_sp]]

bin/manifests/fake.toml

@@ -39,8 +39,8 @@ version = "1.0.0"
 [artifact.control_plane.source]
 kind = "composite-control-plane"
 zones = [
-    { kind = "fake", name = "zone1", size = "1MiB" },
-    { kind = "fake", name = "zone2", size = "1MiB" },
+    { kind = "fake", artifact_name = "zone-1", file_name = "zone1.tar.gz", size = "1MiB" },
+    { kind = "fake", artifact_name = "zone-2", file_name = "zone2.tar.gz", size = "1MiB" },
 ]
 
 [[artifact.psc_sp]]

bin/tests/integration-tests/command_tests.rs

@@ -240,7 +240,8 @@ fn test_assemble_duplicate_zone() -> Result<()> {
     cmd.args([
         "assemble",
         "--skip-all-present",
-        "invalid-manifests/duplicate-zone.toml",
+        // TODO: should we also check duplicate zone artifact names?
+        "invalid-manifests/duplicate-zone-file-name.toml",
     ]);
     cmd.arg(&archive_path);
     cmd.assert()
@@ -250,7 +251,7 @@ fn test_assemble_duplicate_zone() -> Result<()> {
         ))
         .stderr(predicate::str::contains("zone/"))
         .stderr(predicate::str::contains(
-            r#"(existing name: zone1.tar.gz, version: 1.0.0; new name: zone1.tar.gz, version: 1.0.0)"#,
+            r#"(existing name: zone1.tar.gz, version: 1.0.0; new name: zone1-dup.tar.gz, version: 1.0.0)"#,
         ));
 
     logctx.cleanup_successful();

lib/src/assemble/manifest.rs

@@ -704,8 +704,10 @@ pub enum DeserializedControlPlaneZoneSource {
         #[serde(skip_serializing_if = "Option::is_none")]
         file_name: Option<String>,
     },
+    #[serde(rename_all = "snake_case")]
     Fake {
-        name: String,
+        artifact_name: String,
+        file_name: String,
         #[serde(deserialize_with = "deserialize_byte_size")]
         size: u64,
     },
@@ -738,7 +740,11 @@ impl DeserializedControlPlaneZoneSource {
                 // change this to use the mtime on disk in the future?)
                 (name.to_owned(), data, MtimeSource::Now)
             }
-            DeserializedControlPlaneZoneSource::Fake { name, size } => {
+            DeserializedControlPlaneZoneSource::Fake {
+                artifact_name,
+                file_name,
+                size,
+            } => {
                 use flate2::{Compression, write::GzEncoder};
                 use tufaceous_brand_metadata::{
                     ArchiveType, LayerInfo, Metadata,
@@ -750,7 +756,7 @@ impl DeserializedControlPlaneZoneSource {
                 ));
 
                 let metadata = Metadata::new(ArchiveType::Layer(LayerInfo {
-                    pkg: name.clone(),
+                    pkg: artifact_name.clone(),
                     version: version.clone(),
                 }));
                 metadata.append_to_tar(&mut tar, 0)?;
@@ -764,11 +770,12 @@ impl DeserializedControlPlaneZoneSource {
                 h.set_cksum();
                 tar.append(
                     &h,
-                    make_filler_text(name, version, *size as usize).as_slice(),
+                    make_filler_text(artifact_name, version, *size as usize)
+                        .as_slice(),
                 )?;
 
                 let data = tar.into_inner()?.finish()?;
-                (format!("{name}.tar.gz"), data, MtimeSource::Zero)
+                (file_name.clone(), data, MtimeSource::Zero)
             }
         };
         let entry = CompositeEntry { data: &data, mtime_source };