Skip to content

Update git dependencies and pin revisions - #11223

Open
jmpesp wants to merge 2 commits into
oxidecomputer:mainfrom
jmpesp:update_hubtools_and_mgs
Open

Update git dependencies and pin revisions#11223
jmpesp wants to merge 2 commits into
oxidecomputer:mainfrom
jmpesp:update_hubtools_and_mgs

Conversation

@jmpesp

@jmpesp jmpesp commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

Change one of the dice-util dependencies so that it refers to a specific pinned revision (copying the one in Cargo.lock) instead of a branch.

before:

$ cargo tree -i dice-verifier
error: specification `dice-verifier` is ambiguous
help: re-run this command with one of the following specifications
  git+https://github.com/oxidecomputer/dice-util?branch=main#dice-verifier@0.3.0-pre0
  git+https://github.com/oxidecomputer/dice-util?rev=4a39ef08d81e5177edee0bddb1146032aa21074d#dice-verifier@0.3.0-pre0

after:

$ cargo tree -i dice-verifier
error: specification `dice-verifier` is ambiguous
help: re-run this command with one of the following specifications
  git+https://github.com/oxidecomputer/dice-util?rev=4a39ef08d81e5177edee0bddb1146032aa21074d#dice-verifier@0.3.0-pre0
  git+https://github.com/oxidecomputer/dice-util?rev=ff9f27aa0d6ef6fb64c349890b6e3c242ea3d8fc#dice-verifier@0.3.0-pre0

Update management-gateway-service to the latest rev to pull in the latest hubtools. Also update package-manifest.toml rev and sha256 accordingly. This pulled in some new `SpHandler trait functions that needed implementing, so fill those in.

Also update to the latest hubtools.

Change one of the dice-util dependencies so that it refers to a specific
pinned revision (copying the one in Cargo.lock) instead of a branch.

before:

```
$ cargo tree -i dice-verifier
error: specification `dice-verifier` is ambiguous
help: re-run this command with one of the following specifications
  git+https://github.com/oxidecomputer/dice-util?branch=main#dice-verifier@0.3.0-pre0
  git+https://github.com/oxidecomputer/dice-util?rev=4a39ef08d81e5177edee0bddb1146032aa21074d#dice-verifier@0.3.0-pre0
```

after:

```
$ cargo tree -i dice-verifier
error: specification `dice-verifier` is ambiguous
help: re-run this command with one of the following specifications
  git+https://github.com/oxidecomputer/dice-util?rev=4a39ef08d81e5177edee0bddb1146032aa21074d#dice-verifier@0.3.0-pre0
  git+https://github.com/oxidecomputer/dice-util?rev=ff9f27aa0d6ef6fb64c349890b6e3c242ea3d8fc#dice-verifier@0.3.0-pre0
```

Update management-gateway-service to the latest rev to pull in the
latest hubtools. Also update package-manifest.toml rev and sha256
accordingly. This pulled in some new `SpHandler trait functions that
needed implementing, so fill those in.

Also update to the latest hubtools.
@jmpesp

jmpesp commented Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

@jordanhendricks @flihp @papertigers I would also appreciate eyes on this from someone familiar with these deps, I don't believe I have regressed anything here.

@jgallagher jgallagher left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MGS-related changes LGTM (modulo two questions below).

Comment thread workspace-hack/Cargo.toml
futures-sink = { version = "0.3.32" }
futures-task = { version = "0.3.32", default-features = false, features = ["std"] }
futures-util = { version = "0.3.32", features = ["channel", "io", "sink"] }
gateway-ereport-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "6c0aca2545a73fd75536e149d29faa7108be5862", default-features = false, features = ["debug-impls", "serde"] }

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why we lost gateway-ereport-messages in this file?

Comment thread package-manifest.toml
only_for_targets.image = "standard"
source.type = "composite"
source.packages = [
"omicron-faux-mgs.tar.gz",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this useful in the stub package?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants