So parliament is basically just passing a new law with those restrictions in it to satisfy the ECJ.
That's completely false. The new law extends the powers over the previous law:
DRIP ignores the main part of the CJEU ruling - that blanket data retention severely interferes with the fundamental rights to respect for private life and to the protection of personal data. The government has claimed that other aspects of the Bill will strengthen oversight and transparency. For example, they claim it will restrict the number of public bodies that can request communications data. Yet this concession does not appear in DRIP or the secondary legislation that will implement it. There has been no acknowledgment of the legal requirement to preserve UK citizens’ right to privacy.