|
24 | 24 | )
|
25 | 25 | from aap_eda.core.utils.credentials import (
|
26 | 26 | add_default_values_to_user_inputs,
|
| 27 | + get_resolved_secrets, |
27 | 28 | get_secret_fields,
|
28 | 29 | )
|
29 | 30 | from aap_eda.core.utils.strings import extract_variables, substitute_variables
|
@@ -323,9 +324,7 @@ def insert_audit_rule_data(self, message: ActionMessage) -> None:
|
323 | 324 | )
|
324 | 325 | )
|
325 | 326 | if credentials:
|
326 |
| - inputs = yaml.safe_load( |
327 |
| - credentials[0].inputs.get_secret_value() |
328 |
| - ) |
| 327 | + inputs = get_resolved_secrets(credentials[0]) |
329 | 328 |
|
330 | 329 | url = self._get_url(message, inputs)
|
331 | 330 | audit_action = models.AuditAction.objects.create(
|
@@ -436,9 +435,8 @@ def get_controller_info_from_aap_cred(
|
436 | 435 | )
|
437 | 436 | for eda_credential in activation.eda_credentials.all():
|
438 | 437 | if eda_credential.credential_type.id == aap_credential_type.id:
|
439 |
| - inputs = yaml.safe_load( |
440 |
| - eda_credential.inputs.get_secret_value() |
441 |
| - ) |
| 438 | + inputs = get_resolved_secrets(eda_credential) |
| 439 | + |
442 | 440 | return ControllerInfo(
|
443 | 441 | url=inputs["host"],
|
444 | 442 | token=inputs.get("oauth_token", ""),
|
@@ -470,7 +468,7 @@ def get_eda_system_vault_passwords(
|
470 | 468 | for credential in activation.eda_credentials.filter(
|
471 | 469 | credential_type_id=vault_credential_type.id
|
472 | 470 | ).union(vault):
|
473 |
| - inputs = yaml.safe_load(credential.inputs.get_secret_value()) |
| 471 | + inputs = get_resolved_secrets(credential) |
474 | 472 |
|
475 | 473 | vault_passwords.append(
|
476 | 474 | VaultPassword(
|
@@ -526,7 +524,7 @@ def get_file_contents_from_credentials(
|
526 | 524 | file_template_names = []
|
527 | 525 | file_messages = []
|
528 | 526 | for eda_credential in activation.eda_credentials.all():
|
529 |
| - inputs = yaml.safe_load(eda_credential.inputs.get_secret_value()) |
| 527 | + inputs = get_resolved_secrets(eda_credential) |
530 | 528 | injectors = eda_credential.credential_type.injectors
|
531 | 529 | binary_fields = []
|
532 | 530 | for field in eda_credential.credential_type.inputs.get(
|
@@ -569,9 +567,7 @@ def get_env_vars_from_credentials(
|
569 | 567 |
|
570 | 568 | schema_inputs = eda_credential.credential_type.inputs
|
571 | 569 | secret_fields = get_secret_fields(schema_inputs)
|
572 |
| - user_inputs = yaml.safe_load( |
573 |
| - eda_credential.inputs.get_secret_value() |
574 |
| - ) |
| 570 | + user_inputs = get_resolved_secrets(eda_credential) |
575 | 571 |
|
576 | 572 | add_default_values_to_user_inputs(schema_inputs, user_inputs)
|
577 | 573 |
|
@@ -626,8 +622,9 @@ def get_vault_password_and_id(
|
626 | 622 | activation: models.Activation,
|
627 | 623 | ) -> [tp.Optional[str], tp.Optional[str]]:
|
628 | 624 | if activation.eda_system_vault_credential:
|
629 |
| - vault_inputs = activation.eda_system_vault_credential.inputs |
630 |
| - vault_inputs = yaml.safe_load(vault_inputs.get_secret_value()) |
| 625 | + vault_inputs = get_resolved_secrets( |
| 626 | + activation.eda_system_vault_credential |
| 627 | + ) |
631 | 628 | return vault_inputs["vault_password"], vault_inputs["vault_id"]
|
632 | 629 | return None, None
|
633 | 630 |
|
|
0 commit comments