Update transcrypt for merge and pre-commit features

ixc / ixc-django-docker

Scripts and config files that make it easier to run Django projects consistently with and without Docker.

5 stars 1 forks source link

Update transcrypt for merge and pre-commit features #23

Closed jmurty closed 4 years ago

jmurty commented 4 years ago

Update the transcrypt encryption utility to be based on upstream's version 1.1.0 but also with new features from our IC fork:

on init, add a merge driver to properly handle merge of secrets files with conflicting changes: https://github.com/ixc/transcrypt/pull/1 The .gitattributes file is also adjusted to apply the merge driver.
on init, add a Git pre-commit hook script to abort commit if raw content of a secrets file is not properly encrypted: https://github.com/ixc/transcrypt/pull/2
cherry-picked upstream fix to silence spurious warnings: http://github.com/elasticdog/transcrypt/commit/9a8a1f

Script sourced from https://github.com/ixc/transcrypt/commit/e9e1d96c

jmurty commented 4 years ago

Hi @Aramgutang and @mrmachine these IC-specific improvements to transcrypt have been working okay in AGSA for a little while now, and solve a couple of big problems with the tool.

But since this involves both encryption and git magic – both things very easy to stuff up – it would benefit from some review or testing before we start rolling it out to future sites or upgraded sites.

Aramgutang commented 4 years ago

I don't think I have the domain knowledge to provide useful feedback, I'm afraid.

jmurty commented 4 years ago

@Aramgutang if you're keen you could follow the reproduction steps in that Stack Overflow question to compare results of the old or new scripts, but no problem if you're not so keen

Aramgutang commented 4 years ago

I don't use go.sh locally and I rely on my system installation of transcrypt, so reproducing the scenario would take a bunch of extra steps for me. I'm happy with having to wrangle merge conflicts in secrets files manually, if they happen to me.

jmurty commented 4 years ago

This PR was made redundant by f3c2dafd4248e260dfeaa32316f694c6359080cc