Skip to content

dropshot-api-manager 0.7.1#1129

Merged
david-crespo merged 6 commits intomasterfrom
bump-dropshot-api
Apr 28, 2026
Merged

dropshot-api-manager 0.7.1#1129
david-crespo merged 6 commits intomasterfrom
bump-dropshot-api

Conversation

@david-crespo
Copy link
Copy Markdown
Contributor

@david-crespo david-crespo commented Apr 27, 2026

Intended to supersede #1128, which undoes the Dropshot bump.

Dropshot 0.17 includes a change oxidecomputer/dropshot#1554 that changes the OpenAPI schema for websocket endpoints. Normally to account for a schema change you just have to bump the API version, but dropshot-api-manager is thrown off because when it regenerates the schema for the blessed (old) version, it doesn't match what's on disk because the one on disk doesn't have the websocket change in it. This required oxidecomputer/dropshot-api-manager#87, which tells dropshot-api-manager specifically to ignore that websocket schema change. You still have to add an API version.

Also had to bump progenitor for oxidecomputer/progenitor#1320.

run: cargo test --lib --verbose
- name: Test everything
run: cargo test --locked
# Build and test propolis-the-library on its own; `cargo test --lib` as used
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is copied from #1128

@david-crespo
Copy link
Copy Markdown
Contributor Author

It seems the one remaining check failure is expected.

# This job runs the PHD migrate-from-base tests, which test upgrading from the
# current mainline propolis-server to the propolis-server version under test.
#
# PHD always uses the propolis-client from the commit under test, so these tests
# will fail if there is a breaking change to the Propolis API. They'll also fail
# if there's a breaking change to the migration protocol. These changes may be
# expected, in which case this run will fail. However, the "regular" phd-run
# job should always be green before merging new PRs.
#
# This job will be removed once API breaking changes are no longer allowed.

@jmpesp
Copy link
Copy Markdown
Contributor

jmpesp commented Apr 28, 2026

It seems the one remaining check failure is expected.

# This job runs the PHD migrate-from-base tests, which test upgrading from the
# current mainline propolis-server to the propolis-server version under test.
#
# PHD always uses the propolis-client from the commit under test, so these tests
# will fail if there is a breaking change to the Propolis API. They'll also fail
# if there's a breaking change to the migration protocol. These changes may be
# expected, in which case this run will fail. However, the "regular" phd-run
# job should always be green before merging new PRs.
#
# This job will be removed once API breaking changes are no longer allowed.

In lieu of addressing this here, maybe we should open an issue and limit this PR to only adding cargo text -- test_apis_up_to_date?

@jmpesp
Copy link
Copy Markdown
Contributor

jmpesp commented Apr 28, 2026

Nevermind, the Rust workflow isn't activating for PRs, disregard - though that may be its own problem to address

@jmpesp
Copy link
Copy Markdown
Contributor

jmpesp commented Apr 28, 2026

However I think the original change from the other PR to add fetch depth isn't right. From omicron:

    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
      with:
        ref: ${{ github.event.pull_request.head.sha }} # see omicron#4461
        fetch-depth: 0 # git-stub-vcs needs full history

@david-crespo
Copy link
Copy Markdown
Contributor Author

ah, ew oxidecomputer/omicron#4461. will update

@AlejandroME AlejandroME added this to the 20 milestone Apr 28, 2026
Comment thread .github/workflows/rust.yml Outdated
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# see https://github.com/oxidecomputer/omicron/issues/4461
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.

I think you need the with: here

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this is what I get for doing it by hand

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.

also this needs to be under the build-and-test job :)

@iximeow
Copy link
Copy Markdown
Member

iximeow commented Apr 28, 2026

Instead, it checks out a merge commit of the PR tip with the target branch as of the time the PR was created.

til and what in the world

Copy link
Copy Markdown
Member

@iximeow iximeow left a comment

Choose a reason for hiding this comment

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

nice, thanks.

mote for later re. steps.with.ref being github.event.pull_request.head.sha: consensus is that we'd expect the tests to all pass regardless of the specific ref used for tests here. for the same reason as in Omicron#4461 it's better for GH Actions and buildomat to test changes the same way, so it doesn't hurt to include here too.

@david-crespo david-crespo merged commit d9e5dc0 into master Apr 28, 2026
13 of 14 checks passed
@david-crespo david-crespo deleted the bump-dropshot-api branch April 28, 2026 20:12
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.

4 participants