Skip to content

[inventory] record caboose SIGN value #8021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[inventory] record caboose SIGN value #8021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5116503
[inventory] record caboose SIGN value
karencfv Apr 22, 2025
567731e
use IS NOT DISTINCT FROM instead of EQ for nullable field
karencfv Apr 24, 2025
d408a44
fmt
karencfv Apr 24, 2025
ba10e73
create unique index
karencfv Apr 29, 2025
8ac5b88
merge main
karencfv Apr 30, 2025
8803cde
expectorate
karencfv Apr 30, 2025
f659621
fmt
karencfv Apr 30, 2025
531912b
drop the index first
karencfv Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions dev-tools/omdb/src/bin/omdb/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6756,6 +6756,8 @@ async fn cmd_db_inventory_cabooses(
git_commit: String,
name: String,
version: String,
#[tabled(display_with = "option_impl_display")]
sign: Option<String>,
}

use nexus_db_schema::schema::sw_caboose::dsl;
Expand All @@ -6774,6 +6776,7 @@ async fn cmd_db_inventory_cabooses(
name: caboose.name,
version: caboose.version,
git_commit: caboose.git_commit,
sign: caboose.sign,
});
let table = tabled::Table::new(rows)
.with(tabled::settings::Style::empty())
Expand Down Expand Up @@ -7122,6 +7125,8 @@ async fn inv_collection_print_devices(
name: &'a str,
version: &'a str,
git_commit: &'a str,
#[tabled(display_with = "option_impl_display")]
sign: &'a Option<String>,
}

println!(" cabooses:");
Expand All @@ -7135,6 +7140,7 @@ async fn inv_collection_print_devices(
name: &found_caboose.caboose.name,
version: &found_caboose.caboose.version,
git_commit: &found_caboose.caboose.git_commit,
sign: &found_caboose.caboose.sign,
})
.collect();
let table = tabled::Table::new(caboose_rows)
Expand Down
3 changes: 3 additions & 0 deletions nexus/db-model/src/inventory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ pub struct SwCaboose {
pub git_commit: String,
pub name: String,
pub version: String,
pub sign: Option<String>,
}

impl From<Caboose> for SwCaboose {
Expand All @@ -468,6 +469,7 @@ impl From<Caboose> for SwCaboose {
git_commit: c.git_commit,
name: c.name,
version: c.version,
sign: c.sign,
}
}
}
Expand All @@ -479,6 +481,7 @@ impl From<SwCaboose> for Caboose {
git_commit: row.git_commit,
name: row.name,
version: row.version,
sign: row.sign,
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion nexus/db-model/src/schema_versions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use std::{collections::BTreeMap, sync::LazyLock};
///
/// This must be updated when you change the database schema. Refer to
/// schema/crdb/README.adoc in the root of this repository for details.
pub const SCHEMA_VERSION: Version = Version::new(139, 0, 0);
pub const SCHEMA_VERSION: Version = Version::new(140, 0, 0);

/// List of all past database schema versions, in *reverse* order
///
Expand All @@ -28,6 +28,7 @@ static KNOWN_VERSIONS: LazyLock<Vec<KnownVersion>> = LazyLock::new(|| {
// | leaving the first copy as an example for the next person.
// v
// KnownVersion::new(next_int, "unique-dirname-with-the-sql-files"),
KnownVersion::new(140, "caboose-sign-value"),
KnownVersion::new(139, "webhooks"),
KnownVersion::new(138, "saga-abandoned-state"),
KnownVersion::new(137, "oximeter-read-policy"),
Expand Down
9 changes: 7 additions & 2 deletions nexus/db-queries/src/db/datastore/inventory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use diesel::IntoSql;
use diesel::JoinOnDsl;
use diesel::NullableExpressionMethods;
use diesel::OptionalExtension;
use diesel::PgExpressionMethods;
use diesel::QueryDsl;
use diesel::Table;
use diesel::expression::SelectableHelper;
Expand Down Expand Up @@ -554,7 +555,7 @@ impl DataStore {
// - `hw_baseboard` with an "id" primary key and lookup columns
// "part_number" and "serial_number"
// - `sw_caboose` with an "id" primary key and lookup columns
// "board", "git_commit", "name", and "version"
// "board", "git_commit", "name", "version, and sign"
// - `inv_caboose` with foreign keys "hw_baseboard_id",
// "sw_caboose_id", and various other columns
//
Expand Down Expand Up @@ -596,7 +597,8 @@ impl DataStore {
// AND sw_caboose.board = ...
// AND sw_caboose.git_commit = ...
// AND sw_caboose.name = ...
// AND sw_caboose.version = ...;
// AND sw_caboose.version = ...
// AND sw_caboose.sign IS NOT DISTINCT FROM ...;
//
// Again, the whole point is to avoid back-and-forth between the
// client and the database. Those back-and-forth interactions can
Expand Down Expand Up @@ -642,6 +644,9 @@ impl DataStore {
)
.and(dsl_sw_caboose::version.eq(
found_caboose.caboose.version.clone(),
))
.and(dsl_sw_caboose::sign.is_not_distinct_from(
found_caboose.caboose.sign.clone(),
)),
),
)
Expand Down
1 change: 1 addition & 0 deletions nexus/db-schema/src/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,6 +1475,7 @@ table! {
git_commit -> Text,
name -> Text,
version -> Text,
sign -> Nullable<Text>,
}
}

Expand Down
7 changes: 4 additions & 3 deletions nexus/inventory/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@ mod test {
git_commit: String::from("git_commit_1"),
name: String::from("name_1"),
version: String::from("version_1"),
sign: Some(String::from("sign_1")),
};
for bb in &common_caboose_baseboards {
let _ = collection.sps.get(*bb).unwrap();
Expand Down Expand Up @@ -1105,7 +1106,7 @@ mod test {
git_commit: String::from("git_commit1"),
name: String::from("name1"),
version: String::from("version1"),
sign: None,
sign: Some(String::from("sign1")),
epoch: None,
};
assert!(
Expand All @@ -1125,7 +1126,7 @@ mod test {
"reporting caboose for unknown baseboard: \
BaseboardId { part_number: \"p1\", serial_number: \"bogus\" } \
(Caboose { board: \"board1\", git_commit: \"git_commit1\", \
name: \"name1\", version: \"version1\" })"
name: \"name1\", version: \"version1\", sign: Some(\"sign1\") })"
);
assert!(
!builder
Expand Down Expand Up @@ -1177,7 +1178,7 @@ mod test {
git_commit: String::from("git_commit2"),
name: String::from("name2"),
version: String::from("version2"),
sign: None,
sign: Some(String::from("sign2")),
epoch: None,
},
)
Expand Down
4 changes: 2 additions & 2 deletions nexus/inventory/src/collector.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,8 @@ mod test {
for c in &collection.cabooses {
write!(
&mut s,
" board {:?} name {:?} version {:?} git_commit {:?}\n",
c.board, c.name, c.version, c.git_commit,
" board {:?} name {:?} version {:?} git_commit {:?} sign {:?}\n",
c.board, c.name, c.version, c.git_commit, c.sign,
)
.unwrap();
}
Expand Down
2 changes: 1 addition & 1 deletion nexus/inventory/src/examples.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ pub fn caboose(unique: &str) -> SpComponentCaboose {
git_commit: format!("git_commit_{}", unique),
name: format!("name_{}", unique),
version: format!("version_{}", unique),
sign: None,
sign: Some(format!("sign_{}", unique)),
epoch: None,
}
}
Expand Down
24 changes: 12 additions & 12 deletions nexus/inventory/tests/output/collector_basic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ baseboards:
part "sim-gimlet" serial "sim-9cb9b78f-5614-440c-b66d-e8e81fab69b0"

cabooses:
board "SimGimletSp" name "SimGimlet" version "0.0.1" git_commit "fefefefe"
board "SimGimletSp" name "SimGimlet" version "0.0.2" git_commit "ffffffff"
board "SimRot" name "SimGimletRot" version "0.0.3" git_commit "edededed"
board "SimRot" name "SimSidecarRot" version "0.0.3" git_commit "edededed"
board "SimRot" name "SimGimletRot" version "0.0.4" git_commit "eeeeeeee"
board "SimRot" name "SimSidecarRot" version "0.0.4" git_commit "eeeeeeee"
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "dadadadad"
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "dadadadad"
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "ddddddddd"
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "ddddddddd"
board "SimSidecarSp" name "SimSidecar" version "0.0.1" git_commit "fefefefe"
board "SimSidecarSp" name "SimSidecar" version "0.0.2" git_commit "ffffffff"
board "SimGimletSp" name "SimGimlet" version "0.0.1" git_commit "fefefefe" sign None
board "SimGimletSp" name "SimGimlet" version "0.0.2" git_commit "ffffffff" sign None
board "SimRot" name "SimGimletRot" version "0.0.3" git_commit "edededed" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimSidecarRot" version "0.0.3" git_commit "edededed" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimGimletRot" version "0.0.4" git_commit "eeeeeeee" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimSidecarRot" version "0.0.4" git_commit "eeeeeeee" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "dadadadad" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "dadadadad" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "ddddddddd" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "ddddddddd" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimSidecarSp" name "SimSidecar" version "0.0.1" git_commit "fefefefe" sign None
board "SimSidecarSp" name "SimSidecar" version "0.0.2" git_commit "ffffffff" sign None

rot pages:
data_base64 "Z2ltbGV0LWNmcGEtYWN0aXZlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
Expand Down
24 changes: 12 additions & 12 deletions nexus/inventory/tests/output/collector_errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ baseboards:
part "i86pc" serial "SimGimlet01"

cabooses:
board "SimGimletSp" name "SimGimlet" version "0.0.1" git_commit "fefefefe"
board "SimGimletSp" name "SimGimlet" version "0.0.2" git_commit "ffffffff"
board "SimRot" name "SimGimletRot" version "0.0.3" git_commit "edededed"
board "SimRot" name "SimSidecarRot" version "0.0.3" git_commit "edededed"
board "SimRot" name "SimGimletRot" version "0.0.4" git_commit "eeeeeeee"
board "SimRot" name "SimSidecarRot" version "0.0.4" git_commit "eeeeeeee"
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "dadadadad"
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "dadadadad"
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "ddddddddd"
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "ddddddddd"
board "SimSidecarSp" name "SimSidecar" version "0.0.1" git_commit "fefefefe"
board "SimSidecarSp" name "SimSidecar" version "0.0.2" git_commit "ffffffff"
board "SimGimletSp" name "SimGimlet" version "0.0.1" git_commit "fefefefe" sign None
board "SimGimletSp" name "SimGimlet" version "0.0.2" git_commit "ffffffff" sign None
board "SimRot" name "SimGimletRot" version "0.0.3" git_commit "edededed" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimSidecarRot" version "0.0.3" git_commit "edededed" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimGimletRot" version "0.0.4" git_commit "eeeeeeee" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimSidecarRot" version "0.0.4" git_commit "eeeeeeee" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "dadadadad" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "dadadadad" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "ddddddddd" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "ddddddddd" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimSidecarSp" name "SimSidecar" version "0.0.1" git_commit "fefefefe" sign None
board "SimSidecarSp" name "SimSidecar" version "0.0.2" git_commit "ffffffff" sign None

rot pages:
data_base64 "Z2ltbGV0LWNmcGEtYWN0aXZlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
Expand Down
24 changes: 12 additions & 12 deletions nexus/inventory/tests/output/collector_sled_agent_errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ baseboards:
part "sim-gimlet" serial "sim-9cb9b78f-5614-440c-b66d-e8e81fab69b0"

cabooses:
board "SimGimletSp" name "SimGimlet" version "0.0.1" git_commit "fefefefe"
board "SimGimletSp" name "SimGimlet" version "0.0.2" git_commit "ffffffff"
board "SimRot" name "SimGimletRot" version "0.0.3" git_commit "edededed"
board "SimRot" name "SimSidecarRot" version "0.0.3" git_commit "edededed"
board "SimRot" name "SimGimletRot" version "0.0.4" git_commit "eeeeeeee"
board "SimRot" name "SimSidecarRot" version "0.0.4" git_commit "eeeeeeee"
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "dadadadad"
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "dadadadad"
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "ddddddddd"
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "ddddddddd"
board "SimSidecarSp" name "SimSidecar" version "0.0.1" git_commit "fefefefe"
board "SimSidecarSp" name "SimSidecar" version "0.0.2" git_commit "ffffffff"
board "SimGimletSp" name "SimGimlet" version "0.0.1" git_commit "fefefefe" sign None
board "SimGimletSp" name "SimGimlet" version "0.0.2" git_commit "ffffffff" sign None
board "SimRot" name "SimGimletRot" version "0.0.3" git_commit "edededed" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimSidecarRot" version "0.0.3" git_commit "edededed" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimGimletRot" version "0.0.4" git_commit "eeeeeeee" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRot" name "SimSidecarRot" version "0.0.4" git_commit "eeeeeeee" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "dadadadad" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "dadadadad" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimGimletRot" version "0.0.200" git_commit "ddddddddd" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimRotStage0" name "SimSidecarRot" version "0.0.200" git_commit "ddddddddd" sign Some("11594bb5548a757e918e6fe056e2ad9e084297c9555417a025d8788eacf55daf")
board "SimSidecarSp" name "SimSidecar" version "0.0.1" git_commit "fefefefe" sign None
board "SimSidecarSp" name "SimSidecar" version "0.0.2" git_commit "ffffffff" sign None

rot pages:
data_base64 "Z2ltbGV0LWNmcGEtYWN0aXZlAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
Expand Down
4 changes: 4 additions & 0 deletions nexus/types/src/inventory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ pub struct Caboose {
pub git_commit: String,
pub name: String,
pub version: String,
// The sign will generally be present for production RoT and RoT bootloader images.
// It's currently absent from SP images and could be absent from RoT images as well.
pub sign: Option<String>,
}

impl From<gateway_client::types::SpComponentCaboose> for Caboose {
Expand All @@ -269,6 +272,7 @@ impl From<gateway_client::types::SpComponentCaboose> for Caboose {
git_commit: c.git_commit,
name: c.name,
version: c.version,
sign: c.sign,
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions schema/crdb/caboose-sign-value/up01.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ALTER TABLE omicron.public.sw_caboose
ADD COLUMN IF NOT EXISTS sign TEXT; -- nullable
1 change: 1 addition & 0 deletions schema/crdb/caboose-sign-value/up02.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DROP INDEX IF EXISTS omicron.public.sw_caboose@caboose_properties;
2 changes: 2 additions & 0 deletions schema/crdb/caboose-sign-value/up03.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CREATE UNIQUE INDEX IF NOT EXISTS caboose_properties
on omicron.public.sw_caboose (board, git_commit, name, version, sign);
7 changes: 4 additions & 3 deletions schema/crdb/dbinit.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3347,10 +3347,11 @@ CREATE TABLE IF NOT EXISTS omicron.public.sw_caboose (
board TEXT NOT NULL,
git_commit TEXT NOT NULL,
name TEXT NOT NULL,
version TEXT NOT NULL
version TEXT NOT NULL,
sign TEXT -- nullable
);
CREATE UNIQUE INDEX IF NOT EXISTS caboose_properties
on omicron.public.sw_caboose (board, git_commit, name, version);
on omicron.public.sw_caboose (board, git_commit, name, version, sign);

/* root of trust pages: this table assigns unique ids to distinct RoT CMPA
and CFPA page contents, each of which is a 512-byte blob */
Expand Down Expand Up @@ -5476,7 +5477,7 @@ INSERT INTO omicron.public.db_metadata (
version,
target_version
) VALUES
(TRUE, NOW(), NOW(), '139.0.0', NULL)
(TRUE, NOW(), NOW(), '140.0.0', NULL)
ON CONFLICT DO NOTHING;

COMMIT;
Loading