What I'm a little afraid of is the congress will just carve out a warranty exception for the military as a bandaid to fix this specific issue without addressing

What I'm a little afraid of is the congress will just carve out a warranty exception for the military as a bandaid to fix this specific issue without addressing right to repair on the whole. I could easily see them passing a law that basically says 'warranties shall not be considered void due to repairs made as part of a military mission' or something similar (wrapped in way more legalese) and leaving it at that or giving the full right to repair, ie: suppliers must provide CAD, board schematics, and make available replacement parts, but only for the military.