1313 introduces git force pushes. While this is ok from the user point of view, this impedes with operations since now ops will need to ask eng to lock the repo first, then edit it on github, then unlock the repo, then submit the repair form (since the repair form also attempts to acquire the lock)
Solution
There are 3 modes for the repair form now.
Lock only
Repair without lock
Repair with lock
Repair with lock is what the repair form used to do. This is now not the recommended flow for editing sites. The recommended flow to edit the sites manually should be
submit lock only repair form
make edits
submit form to repair without lock
Intentionally leaving the option to continue to repair without lock in case there is any lingering divergence bet staging and staging lite.
Breaking Changes
[ ] Yes - this PR contains breaking changes
Details ...
[X] No - this PR is backwards compatible with ALL of the following feature flags in this doc
Before & After Screenshots
BEFORE:
AFTER:
Changes to form:
Tests
[ ] submit repair from to just lock an email login repo
[ ] assert that the repo is not able to be edited on the cms
[ ] make some changes in the email login repo directly on github
[ ] submit the repair form without locking (since the locking was already done on the first step)
[ ] assert that you receive a successful repaired email
[ ] submit the repair form one last time for the mode "repair with locking"
[ ] assert that you receive a successful repaired email
Deploy Notes
Modify the production form to be similar to the one in staging. Concretely, add a dropdown with the
title
Repair mode
description:
Select 'Only lock repo' if you want to do manual repairs directly on Github.
Select 'Repair without acquiring lock' if you want to sync the changes from Github onto EFS and you have already submitted this form to lock the repo.
Select 'Repair with acquiring lock' if you want to just want to repair the repo as is without any modification.
options:
Only lock repo
Repair without acquiring lock
Repair with acquiring lock
It should match what you see here:
This needs to be released prior/in the same release as #1313. Once this is live, inform the isomer channel about the newer flow.
Problem
1313 introduces git force pushes. While this is ok from the user point of view, this impedes with operations since now ops will need to ask eng to lock the repo first, then edit it on github, then unlock the repo, then submit the repair form (since the repair form also attempts to acquire the lock)
Solution
There are 3 modes for the repair form now.
Repair with lock is what the repair form used to do. This is now not the recommended flow for editing sites. The recommended flow to edit the sites manually should be
Intentionally leaving the option to continue to repair without lock in case there is any lingering divergence bet staging and staging lite.
Breaking Changes
Before & After Screenshots
BEFORE:
AFTER:
Changes to form:
Tests
Deploy Notes
Modify the production form to be similar to the one in staging. Concretely, add a dropdown with the
title
Repair mode
description:
Select 'Only lock repo' if you want to do manual repairs directly on Github. Select 'Repair without acquiring lock' if you want to sync the changes from Github onto EFS and you have already submitted this form to lock the repo. Select 'Repair with acquiring lock' if you want to just want to repair the repo as is without any modification.
options:
Only lock repo Repair without acquiring lock Repair with acquiring lock
It should match what you see here:
This needs to be released prior/in the same release as #1313. Once this is live, inform the isomer channel about the newer flow.