Skip to content

Commit b743b94

Browse files
authored
fix: allow for RHAPP, file content and env vars from SMS (#1383)
We missed this file when working on PR #1361 https://issues.redhat.com/browse/AAP-51904 We are adding an ATF test to do the real integration test https://issues.redhat.com/browse/AAP-51905
1 parent d40d041 commit b743b94

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

src/aap_eda/wsapi/consumers.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
)
2525
from aap_eda.core.utils.credentials import (
2626
add_default_values_to_user_inputs,
27+
get_resolved_secrets,
2728
get_secret_fields,
2829
)
2930
from aap_eda.core.utils.strings import extract_variables, substitute_variables
@@ -323,9 +324,7 @@ def insert_audit_rule_data(self, message: ActionMessage) -> None:
323324
)
324325
)
325326
if credentials:
326-
inputs = yaml.safe_load(
327-
credentials[0].inputs.get_secret_value()
328-
)
327+
inputs = get_resolved_secrets(credentials[0])
329328

330329
url = self._get_url(message, inputs)
331330
audit_action = models.AuditAction.objects.create(
@@ -436,9 +435,8 @@ def get_controller_info_from_aap_cred(
436435
)
437436
for eda_credential in activation.eda_credentials.all():
438437
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+
442440
return ControllerInfo(
443441
url=inputs["host"],
444442
token=inputs.get("oauth_token", ""),
@@ -470,7 +468,7 @@ def get_eda_system_vault_passwords(
470468
for credential in activation.eda_credentials.filter(
471469
credential_type_id=vault_credential_type.id
472470
).union(vault):
473-
inputs = yaml.safe_load(credential.inputs.get_secret_value())
471+
inputs = get_resolved_secrets(credential)
474472

475473
vault_passwords.append(
476474
VaultPassword(
@@ -526,7 +524,7 @@ def get_file_contents_from_credentials(
526524
file_template_names = []
527525
file_messages = []
528526
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)
530528
injectors = eda_credential.credential_type.injectors
531529
binary_fields = []
532530
for field in eda_credential.credential_type.inputs.get(
@@ -569,9 +567,7 @@ def get_env_vars_from_credentials(
569567

570568
schema_inputs = eda_credential.credential_type.inputs
571569
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)
575571

576572
add_default_values_to_user_inputs(schema_inputs, user_inputs)
577573

@@ -626,8 +622,9 @@ def get_vault_password_and_id(
626622
activation: models.Activation,
627623
) -> [tp.Optional[str], tp.Optional[str]]:
628624
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+
)
631628
return vault_inputs["vault_password"], vault_inputs["vault_id"]
632629
return None, None
633630

0 commit comments

Comments
 (0)