-
Notifications
You must be signed in to change notification settings - Fork 275
[AINFRA-1539] [Internal] Migrate from configure_apply to git-conceal
#4841
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
Generated by 🚫 Danger |
ee73e6d to
dab694d
Compare
…rated to git-conceal)
- Updated a8c-ci-toolkit to version 6.0.0 in shared-pipeline-vars - Replaced all configure_apply calls with git-conceal-unlock - Moved secrets unlocking step before gem installation in all scripts - Updated all shell scripts and YAML pipeline files
dab694d to
f84cda4
Compare
|
@AliSoftware Should we proceed with this migration? |
|
Hey @MiSikora ! I think if you need to move forward with #4818 you should probably not wait for this migration to
So in the end, even if technically this PR is working, given the above AFK + SysOps approval points, it might take some more time than expected before I can unpause the project and we officailly go forward with merging that PR, and I don't want it to block your progress on #4818. |
Description
This updates the way this repository manages secret files needed for compilation (
secret.properties,sentry.properties, etc) from being managed viaconfigure_applyto being managed bygit-concealinstead.See paaHJt-96q-p2 more details about this migration.
Closes AINFRA-1539
Merge Timing
While this PR can be reviewed and tested already, I don't plan to merge it until January so that I can be around to help with any issues or questions that may arise with the new tool and new process.
Testing Instructions
Note
While not strictly necessary, in order to not risk messing up your everyday working copy while going through those testing instructions, I'd recommend running those steps in a separate fresh clone of the repository instead of in the working copy you usually work with.
secret.propertiessentry.propertiesapp/google-services.jsonautomotive/google-services.jsonwear/google-services.jsongoogle-upload-credentials.jsonfirebase.secrets.jsonrelease.keystore.propertiesfiles being encrypted and thus ignored{app,automotive,wear}/google-services.jsonfiles were all present but encrypted (and thus not valid JSON), how does that impact flows like Google Login in the app? And thus how would this behave for external contributors to this project?README.mdto unlock the repo by copying the decryption key from the Secret Store and runningpbpaste | base64 -d | git conceal unlock -secret.properties,sentry.properties, …) are now read and their properties used during compilationgoogle-services.json?) work as expected in the compiled appNote on CI failure
The CI failure on "Merged Manifest Diff" is expected, because the way this job works is that it switches to this PR's base branch to generate the base manifest and compare it with the one generated from this PR's head… but when it switches to this PR's branch, that base branch (
main) doesn't havegit-concealset up—as it is still relying onconfigure_applyinstead—so it doesn't have thegoogle-services.jsonfile present inmainduring that dance.I expect this to be a transient issue, i.e. once this PR is merged into
mainand other PRs start to rebase on top so that all branches start to usegit-conceal, this internal dance that "Merged Manifest Diff" does should work again.