Stop a clean migration reporting domains it never lost
The post-migration comparison had the two versions counting domains differently, and yesterday's wiring turned that into a gate: `run` would have failed a migration that lost nothing. The 0.15 side added every domain appearing in any account's address on top of the domain principals - the fallback's own comment says "if the instance has no explicit domain principals", but the loop ran unconditionally. The 0.16 side did the reverse, listing only domains some account calls its primary, discarding the full Domain list it had already fetched. An instance with three declared domains and accounts aliased across nine reported nine before and three after. INBUXA is exactly that shape, and this was the account/domain over-count noted as undiagnosed. Both sides now mean "the domains this server holds". A domain that still goes missing is reported as a warning rather than failing the run: what the two versions call a domain differs across this boundary in ways we have now been caught by once, and a missing account - which is compared with a local-part fallback and is what actually matters - still fails. Narrowing OK() also made String() return before printing the domain lines, so the new warning would have been silent. Caught by its own test.
This commit is contained in:
@@ -180,12 +180,21 @@ func (c *Client) principalSnapshotREST(ctx context.Context) (*Snapshot, error) {
|
||||
domainSet[d.Name] = true
|
||||
}
|
||||
}
|
||||
// Fall back to the domains implied by account addresses if the
|
||||
// instance has no explicit domain principals.
|
||||
for _, p := range individuals {
|
||||
for _, email := range p.Emails {
|
||||
if at := strings.LastIndex(email, "@"); at >= 0 && at+1 < len(email) {
|
||||
domainSet[email[at+1:]] = true
|
||||
// Fall back to the domains implied by account addresses only when the
|
||||
// instance declares no domain principals at all.
|
||||
//
|
||||
// This loop used to run unconditionally, which quietly inflated the
|
||||
// list with every alias domain. That matters because this snapshot is
|
||||
// the "before" side of the post-migration comparison, and the 0.16 side
|
||||
// reports the domains the server actually holds: an alias domain that
|
||||
// was never its own principal would be present here, absent there, and
|
||||
// reported as lost by a migration that lost nothing.
|
||||
if len(domainSet) == 0 {
|
||||
for _, p := range individuals {
|
||||
for _, email := range p.Emails {
|
||||
if at := strings.LastIndex(email, "@"); at >= 0 && at+1 < len(email) {
|
||||
domainSet[email[at+1:]] = true
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user