flyingscorpio/setup-cockpit
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Better parsing of the secrets file for verification

Browse source
This commit is contained in:
flyingscorpio@arch-desktop 2020-10-27 16:11:06 +01:00
parent cc349b0c45
commit 32b07ce637
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
install.py
View file

@ -46,7 +46,7 @@ class Installer:
with open("secrets.template", "r") as template_file: with open("secrets.template", "r") as template_file:
template_content = [ template_content = [
line.strip() line.strip()
for line in template_file.readlines() for line in template_file.read().split("\n\n")
if not line.startswith("#") and line.strip() if not line.startswith("#") and line.strip()
] ]
except FileNotFoundError: except FileNotFoundError:
@ -63,10 +63,10 @@ class Installer:
print("No 'secrets' file found. Did you forget to create it?") print("No 'secrets' file found. Did you forget to create it?")
sys.exit(1) sys.exit(1)
# Check that the template file and secrets file have the same keys template_keys = [line.split("=")[0] for line in template_content if "=" in line]
template_keys = [line.split("=")[0] for line in template_content] secrets_keys = [line.split("=")[0] for line in secrets_content if "=" in line]
secrets_keys = [line.split("=")[0] for line in secrets_content]
# Check that the template file and secrets file have the same keys
if template_keys != secrets_keys: if template_keys != secrets_keys:
print( print(
"'secrets.template' and 'secrets' don't have the same keys.\n" "'secrets.template' and 'secrets' don't have the same keys.\n"
@ -74,12 +74,12 @@ class Installer:
) )
sys.exit(1) sys.exit(1)
secrets_values = [line.split("=")[1] for line in secrets_content if "=" in line]
# Check that each key has a value that has been set: # Check that each key has a value that has been set:
for line in secrets_content: for i, value in enumerate(secrets_values):
key, value = line.split("=")
value = value.replace("'", "").replace('"', "")
if not value: if not value:
print(line) key = secrets_keys[i]
print(f" 'secrets' file has no value for {key}, please add one.") print(f" 'secrets' file has no value for {key}, please add one.")
sys.exit(1) sys.exit(1)

3
secrets.template
View file

@ -1,8 +1,11 @@
# secrets - is sourced by some commands - this is a template # secrets - is sourced by some commands - this is a template
SETUP_COCKPIT_EMAIL='john@doe.com' SETUP_COCKPIT_EMAIL='john@doe.com'
SSH_REPO='user@ho.st' SSH_REPO='user@ho.st'
BORG_PASSPHRASE='passphrase' BORG_PASSPHRASE='passphrase'
BORG_EXCLUDES="\ BORG_EXCLUDES="\
/path/to/exlude/* /path/to/exlude/*
/another/*/path/to/exlude/* /another/*/path/to/exlude/*