Merge branch 'affinity-expose-name' into affinity-pagination-cleanup

Author: smklein

.github/buildomat/build-and-test.sh

@@ -70,7 +70,8 @@ banner ls-apis
     ptime -m cargo xtask ls-apis apis &&
         ptime -m cargo xtask ls-apis deployment-units &&
         ptime -m cargo xtask ls-apis servers &&
-        ptime -m cargo xtask ls-apis check
+        ptime -m cargo xtask ls-apis check && \
+	ptime -m cargo xtask ls-apis adoc > /dev/null
 )
 
 #

Cargo.lock

@@ -33,6 +33,7 @@ progenitor::generate_api!(
     replace = {
         AbortUpdateOptions = wicket_common::rack_update::AbortUpdateOptions,
         AllowedSourceIps = omicron_common::api::internal::shared::AllowedSourceIps,
+        ArtifactId = omicron_common::update::ArtifactId,
         Baseboard = sled_hardware_types::Baseboard,
         BgpAuthKey = wicket_common::rack_setup::BgpAuthKey,
         BgpAuthKeyId = wicket_common::rack_setup::BgpAuthKeyId,

clients/wicketd-client/src/lib.rs

@@ -10,9 +10,8 @@ use schemars::{
     gen::SchemaGenerator,
     schema::{Schema, SchemaObject},
 };
-use semver::Version;
 use serde::{Deserialize, Serialize};
-use tufaceous_artifact::{Artifact, ArtifactKind};
+use tufaceous_artifact::{Artifact, ArtifactKind, ArtifactVersion};
 
 /// An identifier for an artifact.
 ///
@@ -35,7 +34,7 @@ pub struct ArtifactId {
     pub name: String,
 
     /// The artifact's version.
-    pub version: Version,
+    pub version: ArtifactVersion,
 
     /// The kind of artifact this is.
     pub kind: ArtifactKind,

common/src/update.rs

@@ -255,11 +255,7 @@ versioned_how = "server"
 client_package_name = "dpd-client"
 label = "Dendrite DPD"
 server_package_name = "dpd"
-# TODO We might need to pick this apart more carefully.  DPD invokes and is
-# invoked by several different services.  It's possible that some of them can
-# treat it as server-managed.
-versioned_how = "client"
-versioned_how_reason = "Sled Agent calling DPD creates a circular dependency"
+versioned_how = "server"
 notes = """
 Dendrite's data plane daemon (`dpd`) is the interface to configure and manage \
 the rack switches. It's consumed by sled-agent to get the rack off the \