[1/n] update tufaceous to pick up more changes (#7879)

Update tufaceous so that:

* tufaceous-brand-metadata changes can be picked up
* tufaceous-artifact now defines `ArtifactHashId` and `ArtifactHash`

Author: sunshowers

Cargo.lock

@@ -11,7 +11,6 @@ mod error;
 pub mod http_pagination;
 pub use crate::api::internal::shared::AllowedSourceIps;
 pub use crate::api::internal::shared::SwitchLocation;
-use crate::update::ArtifactHash;
 use crate::update::ArtifactId;
 use anyhow::Context;
 use api_identity::ObjectIdentity;
@@ -45,6 +44,7 @@ use std::net::IpAddr;
 use std::net::Ipv4Addr;
 use std::num::{NonZeroU16, NonZeroU32};
 use std::str::FromStr;
+use tufaceous_artifact::ArtifactHash;
 use uuid::Uuid;
 
 // The type aliases below exist primarily to ensure consistency among return

common/src/api/external/mod.rs

@@ -32,8 +32,6 @@ pub mod update;
 pub mod vlan;
 pub mod zpool_name;
 
-pub use update::hex_schema;
-
 /// A type that allows adding file and line numbers to log messages
 /// automatically. It should be instantiated at the root logger of each
 /// executable that desires this functionality, as in the following example.
@@ -84,3 +82,14 @@ impl<T> std::fmt::Debug for NoDebug<T> {
         write!(f, "..")
     }
 }
+
+pub fn hex_schema<const N: usize>(
+    gen: &mut schemars::SchemaGenerator,
+) -> schemars::schema::Schema {
+    use schemars::JsonSchema;
+
+    let mut schema: schemars::schema::SchemaObject =
+        <String>::json_schema(gen).into();
+    schema.format = Some(format!("hex string ({N} bytes)"));
+    schema.into()
+}

common/src/lib.rs

@@ -2,21 +2,17 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use std::{fmt, str::FromStr};
+use std::fmt;
 
-use hex::FromHexError;
-use schemars::{
-    JsonSchema,
-    gen::SchemaGenerator,
-    schema::{Schema, SchemaObject},
-};
+use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tufaceous_artifact::{Artifact, ArtifactKind, ArtifactVersion};
 
 /// An identifier for an artifact.
 ///
 /// The kind is [`ArtifactKind`], indicating that it might represent an artifact
 /// whose kind is unknown.
+// TODO: move this to tufaceous-artifact in the future
 #[derive(
     Debug,
     Clone,
@@ -56,84 +52,3 @@ impl From<Artifact> for ArtifactId {
         }
     }
 }
-
-/// A hash-based identifier for an artifact.
-///
-/// Some places, e.g. the installinator, request artifacts by hash rather than
-/// by name and version. This type indicates that.
-#[derive(
-    Debug,
-    Clone,
-    PartialEq,
-    Eq,
-    Hash,
-    Ord,
-    PartialOrd,
-    Deserialize,
-    Serialize,
-    JsonSchema,
-)]
-pub struct ArtifactHashId {
-    /// The kind of artifact this is.
-    pub kind: ArtifactKind,
-
-    /// The hash of the artifact.
-    pub hash: ArtifactHash,
-}
-
-/// The hash of an artifact.
-#[derive(
-    Copy,
-    Clone,
-    Eq,
-    PartialEq,
-    Ord,
-    PartialOrd,
-    Hash,
-    Serialize,
-    Deserialize,
-    JsonSchema,
-)]
-#[serde(transparent)]
-#[cfg_attr(feature = "testing", derive(test_strategy::Arbitrary))]
-pub struct ArtifactHash(
-    #[serde(with = "serde_human_bytes::hex_array")]
-    #[schemars(schema_with = "hex_schema::<32>")]
-    pub [u8; 32],
-);
-
-impl AsRef<[u8]> for ArtifactHash {
-    fn as_ref(&self) -> &[u8] {
-        &self.0
-    }
-}
-
-impl fmt::Debug for ArtifactHash {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("ArtifactHash").field(&hex::encode(self.0)).finish()
-    }
-}
-
-impl fmt::Display for ArtifactHash {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&hex::encode(self.0))
-    }
-}
-
-impl FromStr for ArtifactHash {
-    type Err = FromHexError;
-
-    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        let mut out = [0u8; 32];
-        hex::decode_to_slice(s, &mut out)?;
-        Ok(Self(out))
-    }
-}
-
-/// Produce an OpenAPI schema describing a hex array of a specific length (e.g.,
-/// a hash digest).
-pub fn hex_schema<const N: usize>(gen: &mut SchemaGenerator) -> Schema {
-    let mut schema: SchemaObject = <String>::json_schema(gen).into();
-    schema.format = Some(format!("hex string ({N} bytes)"));
-    schema.into()
-}

common/src/update.rs

@@ -36,7 +36,6 @@ use nexus_types::deployment::{Blueprint, UnstableReconfiguratorState};
 use omicron_common::api::external::Generation;
 use omicron_common::api::external::Name;
 use omicron_common::policy::NEXUS_REDUNDANCY;
-use omicron_common::update::ArtifactHash;
 use omicron_uuid_kinds::BlueprintUuid;
 use omicron_uuid_kinds::CollectionUuid;
 use omicron_uuid_kinds::GenericUuid;
@@ -52,6 +51,7 @@ use std::io::BufRead;
 use std::io::IsTerminal;
 use swrite::{SWrite, swriteln};
 use tabled::Tabled;
+use tufaceous_artifact::ArtifactHash;
 use tufaceous_artifact::ArtifactVersion;
 
 mod log_capture;

dev-tools/reconfigurator-cli/src/main.rs

@@ -21,6 +21,7 @@ slog-term.workspace = true
 termios.workspace = true
 tokio = { workspace = true, features = [ "io-std", "rt-multi-thread", "macros", "time" ] }
 tokio-tungstenite.workspace = true
+tufaceous-artifact.workspace = true
 uuid.workspace = true
 
 gateway-client.workspace = true