diff --git a/dev-tools/ls-apis/api-manifest.toml b/dev-tools/ls-apis/api-manifest.toml index 2c928a8c3cb..873ef78151e 100644 --- a/dev-tools/ls-apis/api-manifest.toml +++ b/dev-tools/ls-apis/api-manifest.toml @@ -549,8 +549,9 @@ requires server-side versioned APIs to not form a cycle. This is a deficiency in the server-side API checking, since this cycle is acceptable on the basis of propolis-server and sled-agent being in the same deployment unit. -This filter should be removed when the intra-deployment relationship between -propolis-server and sled-agent can be tolerated in the component graph check. +This filter should be removed when Omicron#10232 is fixed. At that time, ls-apis +should be able to tolerate the intra-deployment relationship between +propolis-server and sled-agent in the component graph check. """ [[dependency_filter_rules]] @@ -562,13 +563,18 @@ Same as the bogus rule between sled-agent-types and propolis-client. sled-agent-client re-exports some (Crucible!) types from propolis-client for sled-agent-client's consumers. -This bogus rule would be fine enough on its own, though ideally we should not -need sled-agent-client to depend on propolis-client even just for types. But, -perhaps surprisingly, this was necessary to add even though the +This bogus rule would be fine enough on its own, though unnecessary once we +resolve Omicron#10233 - ideally we should not need sled-agent-client to depend +on propolis-client even just for types. + +But, perhaps surprisingly, this was necessary to add even though the dice-verifier->sled-agent-client rule above "broke" the dependency path from -propolis-server through to propolis-client. Once we've fixed the issue requiring -the dice-verifier rule above, we should probably keep this dependency filter -rule. +propolis-server through to propolis-client. This leaves us at: +* if we resolve Omicron#10233, this rule can go +* if we resolve Omicron#10234, this rule can go, but we'll want to keep + the one above. +* if we resolve Omicron#10232, this rule should be able to go, but we may + want to keep it pending #10233. """ [[dependency_filter_rules]]