mirror of
https://github.com/famedly/ansible-collection-base
synced 2024-09-20 06:11:58 +00:00
fix(gpg_secretstore): allow recrypt of all datatypes
This commit is contained in:
parent
8d12e83a45
commit
2b998d030d
1 changed files with 19 additions and 2 deletions
|
@ -299,6 +299,7 @@ def main():
|
||||||
data_type = module.params["data_type"]
|
data_type = module.params["data_type"]
|
||||||
overwrite = module.params["overwrite"]
|
overwrite = module.params["overwrite"]
|
||||||
recrypt = module.params["recrypt"]
|
recrypt = module.params["recrypt"]
|
||||||
|
secret_type = module.params["secret_type"]
|
||||||
|
|
||||||
if overwrite or recrypt:
|
if overwrite or recrypt:
|
||||||
try:
|
try:
|
||||||
|
@ -314,7 +315,15 @@ def main():
|
||||||
except (PasswordDecodeError, FileNotFoundError):
|
except (PasswordDecodeError, FileNotFoundError):
|
||||||
result["action"] = "add"
|
result["action"] = "add"
|
||||||
try:
|
try:
|
||||||
store.put(slug=password_slug, data=secretGenerator.getSecret())
|
if secretGenerator.secret_type == "binary":
|
||||||
|
save_as_data_type = "plain"
|
||||||
|
else:
|
||||||
|
save_as_data_type = data_type
|
||||||
|
store.put(
|
||||||
|
slug=password_slug,
|
||||||
|
data=secretGenerator.getSecret(),
|
||||||
|
data_type=save_as_data_type,
|
||||||
|
)
|
||||||
except (FileNotFoundError, PasswordStoreException):
|
except (FileNotFoundError, PasswordStoreException):
|
||||||
failed = True
|
failed = True
|
||||||
result[
|
result[
|
||||||
|
@ -331,7 +340,15 @@ def main():
|
||||||
logging.v("No secret found, new secret will be generated")
|
logging.v("No secret found, new secret will be generated")
|
||||||
result["secret"] = secretGenerator.getSecret()
|
result["secret"] = secretGenerator.getSecret()
|
||||||
try:
|
try:
|
||||||
store.put(slug=password_slug, data=secretGenerator.getSecret())
|
if secretGenerator.secret_type == "binary":
|
||||||
|
save_as_data_type = "plain"
|
||||||
|
else:
|
||||||
|
save_as_data_type = data_type
|
||||||
|
store.put(
|
||||||
|
slug=password_slug,
|
||||||
|
data=secretGenerator.getSecret(),
|
||||||
|
data_type=save_as_data_type,
|
||||||
|
)
|
||||||
except (FileNotFoundError, PasswordStoreException):
|
except (FileNotFoundError, PasswordStoreException):
|
||||||
failed = True
|
failed = True
|
||||||
result[
|
result[
|
||||||
|
|
Loading…
Reference in a new issue