yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'Fix reading secret from pipe' (#1296) from error-handling into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/1296
This commit is contained in:
Mic92
2024-04-30 14:54:24 +00:00
parent 3da4117702 b5653c169b
commit 480bb396ed
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/clan-cli/clan_cli/secrets/sops.py
View File

@@ -1,3 +1,4 @@
import io
import json import json
import os import os
import shutil import shutil
@@ -171,11 +172,11 @@ def encrypt_file(
elif isinstance(content, bytes): elif isinstance(content, bytes):
with open(f.name, "wb") as fd: with open(f.name, "wb") as fd:
fd.write(content) fd.write(content)
elif isinstance(content, IO): elif isinstance(content, io.IOBase):
with open(f.name, "w") as fd: with open(f.name, "w") as fd:
shutil.copyfileobj(content, fd) shutil.copyfileobj(content, fd)
else: else:
raise ClanError("Invalid content type") raise ClanError(f"Invalid content type: {type(content)}")
# we pass an empty manifest to pick up existing configuration of the user # we pass an empty manifest to pick up existing configuration of the user
args = ["sops", "--config", str(manifest)] args = ["sops", "--config", str(manifest)]
args.extend(["-i", "--encrypt", str(f.name)]) args.extend(["-i", "--encrypt", str(f.name)])