Skip to content
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.

Sign up for GitHub

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

Jump to bottom

cc_ca_certs.py: fix blank line problem when removing CAs and adding n… #483

Merged
merged 7 commits into from
Jul 15, 2020
Merged

cc_ca_certs.py: fix blank line problem when removing CAs and adding n… #483

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bdad941
cc_ca_certs.py: fix blank line problem when removing CAs and adding n…
dermotbradley Jul 8, 2020
ca01d20
test_handler_ca_certs.py: Testcase for deleting existing CAs and addi…
dermotbradley Jul 9, 2020
dcb0de8
test_hander_ca_certs.py: Mock the os.stat call
dermotbradley Jul 14, 2020
974db95
test_handler_ca_certs.py: Remove mock_load as file is not loaded when…
dermotbradley Jul 14, 2020
f33ca79
test_handler_ca_certs.py: Remove unused variable to fix plake8/pylint…
dermotbradley Jul 14, 2020
44dfc89
test_handler_ca_certs.py: autospec mock_write.
dermotbradley Jul 15, 2020
6e3f9c8
Merge branch 'master' into cc_ca_certs-blank-line-fix
OddBloke Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions cloudinit/config/cc_ca_certs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,19 @@ def add_ca_certs(certs):
cert_file_contents = "\n".join([str(c) for c in certs])
util.write_file(CA_CERT_FULL_PATH, cert_file_contents, mode=0o644)

# Append cert filename to CA_CERT_CONFIG file.
# We have to strip the content because blank lines in the file
# causes subsequent entries to be ignored. (LP: #1077020)
orig = util.load_file(CA_CERT_CONFIG)
cur_cont = '\n'.join([line for line in orig.splitlines()
if line != CA_CERT_FILENAME])
out = "%s\n%s\n" % (cur_cont.rstrip(), CA_CERT_FILENAME)
OddBloke marked this conversation as resolved.
Show resolved Hide resolved
if os.stat(CA_CERT_CONFIG).st_size == 0:
# If the CA_CERT_CONFIG file is empty (i.e. all existing
# CA certs have been deleted) then simply output a single
# line with the cloud-init cert filename.
out = "%s\n" % CA_CERT_FILENAME
else:
# Append cert filename to CA_CERT_CONFIG file.
# We have to strip the content because blank lines in the file
# causes subsequent entries to be ignored. (LP: #1077020)
orig = util.load_file(CA_CERT_CONFIG)
cur_cont = '\n'.join([line for line in orig.splitlines()
if line != CA_CERT_FILENAME])
out = "%s\n%s\n" % (cur_cont.rstrip(), CA_CERT_FILENAME)
util.write_file(CA_CERT_CONFIG, out, omode="wb")


Expand Down